Unicode changes to support QRF