XML Security fixes