Two new regressions + a fix.