Data-localize fixes