fixes to schema