Fixes some regressions.