Changes to fix issues loading a saved console