Fixes a couple other regressions. This is why rebase is dangerous.