Fixes for portability with libiconv.