Fix Non-BMP char handling