Fixes

Fixed missing code in the repository. The last two changes have been
overwritten in a sense by this one. The repo should now be where it
needs to be.