Netware-specific changes,