Fixing unicode issues