Obstacle avoidance improvements