Minor preparation for Battlecry support