Fix regressions caused by commit c7265f2