Fixing some regressions.