Fix issues with project plan