fixes to work with schemagen refactoring