Fixing some new test failures.