Work around two more test failures.