fixes for unicode
more unicode fixes