Fixes/additions ported back from fTelnet