Minor battle fixes

Some small things in the battle system are fixed.