Fixed another few issues with BattleServer

BattleServer has so many issues.