Small geometry/waypoint fix