fixes for dmg support