More 2.x unicode fixes