More fixes for the console.