Bugfixes in console behavior