Modified a few types to conform to game manager code