Fix project file issues post-merge from master...