diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index 0d3b04b5bf..7b9749755b 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -279,7 +279,7 @@ nm_object_get_boolean_property (NMObject *object,
 								const char *interface,
 								const char *prop_name)
 {
-	gboolean b;
+	gboolean b = FALSE;  // FIXME: somehow convey failure if needed
 	GValue value = {0,};
 
 	if (nm_object_get_property (object, interface, prop_name, &value))
@@ -293,7 +293,7 @@ nm_object_get_byte_property (NMObject *object,
 							 const char *interface,
 							 const char *prop_name)
 {
-	gint8 b;
+	gint8 b = G_MAXINT8;
 	GValue value = {0,};
 
 	if (nm_object_get_property (object, interface, prop_name, &value))
@@ -307,7 +307,7 @@ nm_object_get_double_property (NMObject *object,
 							   const char *interface,
 							   const char *prop_name)
 {
-	gdouble d;
+	gdouble d = G_MAXDOUBLE;
 	GValue value = {0,};
 
 	if (nm_object_get_property (object, interface, prop_name, &value))
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index b79709e589..2bc6d6220b 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -417,7 +417,8 @@ done:
 		nm_vpn_manager_dispose (vpn_manager);
 
 	nm_hal_manager_destroy (hal_manager);
-	nm_policy_destroy (policy);
+	if (policy)
+		nm_policy_destroy (policy);
 
 	if (manager)
 		g_object_unref (manager);
diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c
index cb8ee7aac6..21b2a8259c 100644
--- a/src/NetworkManagerSystem.c
+++ b/src/NetworkManagerSystem.c
@@ -481,7 +481,6 @@ void nm_system_set_mtu (NMDevice *dev)
 	struct rtnl_link *	old;
 	unsigned long		mtu;
 	struct nl_handle *	nlh;
-	const char *		iface;
 
 	mtu = nm_system_get_mtu (dev);
 	if (!mtu)
diff --git a/src/nm-netlink.c b/src/nm-netlink.c
index 27534341db..2adfd25a9e 100644
--- a/src/nm-netlink.c
+++ b/src/nm-netlink.c
@@ -23,6 +23,8 @@
 #include "nm-utils.h"
 
 #include <glib.h>
+#include <pthread.h>
+#include <unistd.h>
 
 static struct nl_cache * link_cache = NULL;
 static struct nl_handle * def_nl_handle = NULL;
@@ -68,8 +70,6 @@ int
 nm_netlink_iface_to_index (const char *iface)
 {
 	struct nl_cache * cache;
-	struct nl_handle * nlh;
-	int i;
 
 	g_return_val_if_fail (iface != NULL, -1);
 
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 008e73bdf9..0b6759f05f 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -4,6 +4,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "nm-ppp-manager.h"
 #include "nm-dbus-manager.h"
@@ -548,6 +549,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
 	nm_debug ("Command line: %s", cmd_str);
 	g_free (cmd_str);
 
+    priv->pid = 0;
 	if (!g_spawn_async (NULL, (char **) ppp_cmd->array->pdata, NULL,
 					G_SPAWN_DO_NOT_REAP_CHILD,
 					pppd_child_setup,