Minor XML changes