Unicode issues resolved