iconv fixes upstream