Additional fixes to continue migration to Github.