Resolving some things broken in MainGame