CORE-4178: fixed a couple of conversion discrepancies