More fixes for hunting and retreat behaviours