more fixes for utf-8