Minor Planner and Import Fixes