Fix more unicode crashes and shorten some lines