Improved fix for g_iconv() compiler warnings