fixed small issues to compile combat related classes