Polish XML fixes