More XML formatting fixes