fixes to schemas