diff --git a/ChangeLog b/ChangeLog
index e6a06c3..905df32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul  2 23:52:34 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
+	* src/libmdb/backend.c:
+	* src/libmdb/iconv.c:
+	* src/libmdb/index.c:
+	* include/mdbtools.h: Fixes based on 'gcc -W -Wall' warnings
+
 Fri Jul  2 07:27:32 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
 	* src/libmdb/backend.c:
 	* src/libmdb/table.c:
diff --git a/include/mdbtools.h b/include/mdbtools.h
index 7a17e6f..0c824f4 100644
--- a/include/mdbtools.h
+++ b/include/mdbtools.h
@@ -520,7 +520,7 @@ extern int mdb_get_option(unsigned long optnum);
 extern void mdb_debug(int klass, char *fmt, ...);
 
 /* iconv.c */
-extern int mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int offset, int len, char *dest);
-extern int mdb_ascii2unicode(MdbHandle *mdb, unsigned char *buf, int offset, int len, char *dest);
+extern int mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int offset, unsigned int len, char *dest);
+extern int mdb_ascii2unicode(MdbHandle *mdb, unsigned char *buf, int offset, unsigned int len, char *dest);
 
 #endif /* _mdbtools_h_ */
diff --git a/src/libmdb/backend.c b/src/libmdb/backend.c
index 9b1c675..e90f807 100644
--- a/src/libmdb/backend.c
+++ b/src/libmdb/backend.c
@@ -162,8 +162,6 @@ int mdb_coltype_takes_length(MdbBackend *backend, int col_type)
  */
 void mdb_init_backends()
 {
-	MdbBackend *backend;
-
 	mdb_backends = g_hash_table_new(g_str_hash, g_str_equal);
 
 	mdb_register_backend(mdb_access_types, "access");
@@ -238,7 +236,7 @@ int mdb_set_default_backend(MdbHandle *mdb, char *backend_name)
 char *mdb_get_relationships(MdbHandle *mdb)
 {
 	unsigned int i;
-	gchar *text;  /* String to be returned */
+	gchar *text = NULL;  /* String to be returned */
 	static char *bound[4];  /* Bound values */
 	static MdbTableDef *table;  /* Relationships table */
 	int backend = 0;  /* Backends: 1=oracle */
diff --git a/src/libmdb/iconv.c b/src/libmdb/iconv.c
index 21fa7e1..f063f52 100644
--- a/src/libmdb/iconv.c
+++ b/src/libmdb/iconv.c
@@ -24,9 +24,9 @@
 #endif
 
 int
-mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int offset, int len, char *dest)
+mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int offset, unsigned int len, char *dest)
 {
-	int i;
+	unsigned int i;
 
 	if (buf[offset]==0xff && buf[offset+1]==0xfe) {
 		strncpy(dest, &buf[offset+2], len-2);
@@ -41,9 +41,9 @@ mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int offset, int len, char
 }
 
 int
-mdb_ascii2unicode(MdbHandle *mdb, unsigned char *buf, int offset, int len, char *dest)
+mdb_ascii2unicode(MdbHandle *mdb, unsigned char *buf, int offset, unsigned int len, char *dest)
 {
-	int i = 0;
+	unsigned int i = 0;
 
 	if (!buf) return 0;
 
diff --git a/src/libmdb/index.c b/src/libmdb/index.c
index df153a9..33a41db 100644
--- a/src/libmdb/index.c
+++ b/src/libmdb/index.c
@@ -170,7 +170,7 @@ mdb_read_indices(MdbTableDef *table)
 void
 mdb_index_hash_text(guchar *text, guchar *hash)
 {
-	int k;
+	unsigned int k;
 
 	for (k=0;k<strlen(text);k++) {
 		hash[k] = idx_to_text[text[k]];
@@ -314,7 +314,7 @@ mdb_index_pack_bitmap(MdbHandle *mdb, MdbIndexPage *ipg)
 {
 	int mask_bit = 0;
 	int mask_pos = 0x16;
-	int mask_byte;
+	int mask_byte = 0;
 	int elem = 0;
 	int len, start, i;
 
@@ -733,7 +733,7 @@ int mdb_index_compute_cost(MdbTableDef *table, MdbIndex *idx)
 {
 	int i;
 	MdbColumn *col;
-	MdbSarg *sarg;
+	MdbSarg *sarg = NULL;
 	int not_all_equal = 0;
 
 	if (!idx->num_keys) return 0;