More XML fixing