Further regressions fixes.