Fixed some combat bugs