fixed some models that were not properly detached and added a failsafe
to EMF model implementations