Add missing planner flags
Shorten up references to Plans