try fix couple combat issues.