Manage WorkPlan Fixes