Various work towards removing Project.owner