diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index df5575342..0214bd866 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -386,7 +386,7 @@ static NMData *nm_data_new (gboolean enable_test_devices)
 	data->main_context = g_main_context_new ();
 	data->main_loop = g_main_loop_new (data->main_context, FALSE);
 
-	if (pipe(data->sigterm_pipe) < 0)
+	if (pipe (data->sigterm_pipe) < 0)
 	{
 		nm_error ("Couldn't create pipe: %s", g_strerror (errno));
 		exit (EXIT_FAILURE);
@@ -623,10 +623,10 @@ nm_monitor_wired_link_state (NMData *data)
 }
 
 static void
-nm_info_handler (const gchar	*log_domain,
-		GLogLevelFlags	 log_level,
-		const gchar	*message,
-		gboolean 	 is_daemon)
+nm_info_handler (const gchar		*log_domain,
+			  GLogLevelFlags	 log_level,
+			  const gchar		*message,
+			  gboolean		 is_daemon)
 {
 	int syslog_priority;	
 
diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c
index 1e0d57cbd..8ae2e8870 100644
--- a/src/NetworkManagerDbus.c
+++ b/src/NetworkManagerDbus.c
@@ -309,10 +309,6 @@ NMState nm_get_app_state_from_data (NMData *data)
 		return NM_STATE_CONNECTING;
 	else
 		return NM_STATE_CONNECTED;
-
-	g_assert_not_reached ();
-
-	return NM_STATE_UNKNOWN;
 }
 
 
@@ -344,6 +340,7 @@ void nm_dbus_signal_state_change (DBusConnection *connection, NMData *data)
 	dbus_message_unref (message);
 }
 
+
 /*
  * nm_dbus_signal_wireless_network_change
  *