Fix fields for locality