Combined the save game fixes to the game project