address fixes to schema