Fix regressions after last merge