More XPD tweaks. Boring