Initial fixes to make Combat the default game mode.