More improvements to the spatial planner.