More unicode to int issues resolved