More multi-byte char fixes.