fixes to the schema