Fixing more regressions