more multi-byte unicode fixes for the encoding case