diff --git a/src/util.c b/src/util.c
index 2fef358c..a66a09e2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -143,8 +143,8 @@ int util_xtoy(unsigned char *dbuffer, int dlen, unsigned char *sbuffer, int slen
     size_t csize;
 
     /* type punning warnings */
-    size_t st_dlen = dlen;
-    size_t st_slen = slen;
+    size_t st_dlen = (size_t)dlen;
+    size_t st_slen = (size_t)slen;
     char *st_dbuffer = dbuffer;
     ICONV_CONST char *st_sbuffer = sbuffer;
 
diff --git a/win32/config.h.templ b/win32/config.h.templ
index 359671e6..37d20d72 100644
--- a/win32/config.h.templ
+++ b/win32/config.h.templ
@@ -148,6 +148,10 @@
 /* */
 #define HAVE_SQL
 
+#define HAVE_ICONV
+#define ICONV_CONST const
+
+
 /* Version number of package */
 #define VERSION "svn-$WCREV$"
 #define BUILD_DATE "$WCNOW$"