More unicode fixes