Fix Gametypes 1 and 2