Project model fixes