More minor fixes to get all tests to pass.