Fix Game and User