Fixes regressions.