Still more changes for r_star_planner