Tweaked a few things to make our test suite pass.