Misc improvements to spatial planner.