Fixes to parsing of commands from servers.