More XML Tweaks