Fix saving/restoring in game