misc fixes to schema