Some combat avoidance logic fixes

See #271