More DMG behavioural fixes