More unicode fixes for #119