Fix lookups in data schema