More fixes to locality.