Fixes for console format