Various fixes for final 2.1.6 version of EMF