fixes for metamodel and base generator