Minor improvements to NTLM support