more 3.4 fixes. Unicode.