Apply required changes for Armory, Battleground.cpp still needs some fixing