Fix some things so the tests pass