Fix "invalid byte sequence in UTF-8" errors