Incorporating changes

Actually integrating the changes I thought were in the last set - had
the repository set incorrectly.