more changes on the libiconv change