Fixed a few oversights the tests caught.