More fixes to nearby logic.