A number of bug fixes to the repos