Mods to make pre-prod data content schema-valid