Build, project fixes