Updates to get waypoint config working.