Bugfixes in console