unicode: Few tweaks.