* Fix metamodel issues
  closes #192