Fixes to the Game classs