HEX-469: More console improvements