fixes to conform with new meta-model