Fix location fields