Actually fix extension regressions