Minor patch
Minor patch (unicode related)
Minor revert