Fixes to the schema