Some more fixes.
Merge branch 'telnet' into telnet