Cleanup and improvements to project-defaults