Fixing regression test failures.