client: ported console fixes by @clearskies