Fix some recent test failures.