Minor changes to GameManager and GroupManager