Minor fixes in the changes in preparation for git migration.