Fix regressions after merges into master