XEP-CMR: Minor fixes