More unicode fixes!