Fixed recently introduced bug in the game selector, opportunistic
cleanups