Fix two regressions