fixes for emf changes
2 files changed