Some unicode fixes missing from last commit