Fixed some combat issues