Minor fixes for console