fix for jenkins.
some more emf code enhance