Other stuff. Sorry for the bad commit messages.