unicode using six
I changed these too, although I'm not sure if I'm supposed to
subsequently, these were changed as well