Fixed many odesign issues caused by metamodel changes