Fixed issues with saving game state