Moar XML fixes