Some fixes for potential savegame issues