Fixes for Project.hxp