Minor fixes of project merges.