Further fixes/optimizations to loading of savegames