fixes for emf changes
4 files changed