diff --git a/ChangeLog b/ChangeLog
index 14e3f9044..6e7f25fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-03-15  Ray Strode  <rstrode@redhat.com>
+
+	Fix a few -Wall -Werror warnings
+
+	* info-daemon/NetworkManagerInfo.c:
+	(main): remove unused loop variable.
+
+	* info-daemon/NetworkManagerInfoDbus.c:
+	(nmi_dbus_nm_is_running): comment out
+	unused static function
+
+	* src/nm-netlink-monitor.c:
+	(receive_pending_bytes):
+	initialize output variables to NULL/0,
+	on function failure (Problem pointed out
+	by Bryan Clark).
+
 2005-03-14  Ray Strode  <rstrode@redhat.com>
 	
 	Fourth (probably working) cut at porting to
diff --git a/info-daemon/NetworkManagerInfo.c b/info-daemon/NetworkManagerInfo.c
index a87b4a30f..65e3f1b26 100644
--- a/info-daemon/NetworkManagerInfo.c
+++ b/info-daemon/NetworkManagerInfo.c
@@ -179,7 +179,6 @@ int main( int argc, char *argv[] )
 	DBusConnection	*dbus_connection;
 	int			 err;
 	NMIAppInfo	*app_info = NULL;
-	GMainLoop		*loop;
 	guint		 notify_id;
 
 	struct poptOption options[] =
diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c
index 1f0e02716..6cc480837 100644
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@@ -781,6 +781,7 @@ static DBusHandlerResult nmi_dbus_filter (DBusConnection *connection, DBusMessag
 	return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 }
 
+#if 0
 /*
  * nmi_dbus_nm_is_running
  *
@@ -800,6 +801,7 @@ static gboolean nmi_dbus_nm_is_running (DBusConnection *connection)
 		dbus_error_free (&error);
 	return (exists);
 }
+#endif
 
 
 /*
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index e7d1d7819..c19d30f74 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -536,7 +536,8 @@ receive_pending_bytes (GIOChannel  *channel,
 		goto out;
 	}
 
-	if (pending_bytes->len > 0)
+out:
+	if ((pending_bytes->len > 0) && succeeded)
 	{
 		if (str_return)
 			*str_return = pending_bytes->str;
@@ -556,7 +557,6 @@ receive_pending_bytes (GIOChannel  *channel,
 			*length = 0;
 	}
 
-out:
 	if (pending_bytes != NULL)
 		g_string_free (pending_bytes, TRUE);
 	return succeeded;