Fixing some regressions