[#846] Fixes for unicode