Minor tweaks to savegame code