Small fixes in XOR module