Fixed issues related to stepping with poison/repels