Fixing regressions and tests.