Fixes for console support