Tweaks for console mode