- Fix some minor patch regressions (#5490)