planner fixes, verified with GraphPlanTest