Fixes on locality.