More xml adjustments