iconv-lite related changes