Fixing iconv deprecation warnings