Various fixes before ownership transfer.

This pull just transfers a few of the things I worked on before transferring ownership of the repository over to my real GitHub account.