Fixes for utf8 chars