Some improvements to onslaught waypoint handling