We'll be able to fix these two once we merge the other pull requests and fix two small nits in the tests.