Fixes to fixes to autocorrel stuff.

It's fixes all the way down.