r4161: two more fixes for NT4 clients. Bugs found by kukks.