Updated to fix arena/game options not being set correctly until after a restart