Some XML fixes