- metamodel generation fixes