Battle bugfixes