Various console fixes