Final fixes to repo