diff --git a/src/nd-cc-provider.c b/src/nd-cc-provider.c
index 6d0b5c89a97a6c4985b062a3c8e133ea337f04c9..eadba77e40e01b6c54d930b1668ab0c50100511b 100644
--- a/src/nd-cc-provider.c
+++ b/src/nd-cc-provider.c
@@ -155,7 +155,7 @@ resolver_found_cb (GaServiceResolver  *resolver,
                    NdCCProvider       *provider)
 {
   NdCCSink *sink = NULL;
-  gchar address[AVAHI_ADDRESS_STR_MAX];
+  gchar ip[AVAHI_ADDRESS_STR_MAX];
   AvahiStringList *cc_name, *cc_model;
 
   /* chromecast has pretty name and model in txt */
@@ -166,12 +166,12 @@ resolver_found_cb (GaServiceResolver  *resolver,
 
   g_debug ("NdCCProvider: Found sink %s at %s:%d on interface %i", name, hostname, port, iface);
 
-  if (avahi_address_snprint (address, sizeof (address), addr) == NULL)
+  if (avahi_address_snprint (ip, sizeof (ip), addr) == NULL)
     g_warning ("NdCCProvider: Failed to convert AvahiAddress to string");
 
-  g_debug ("NdCCProvider: Resolved %s to %s", hostname, address);
+  g_debug ("NdCCProvider: Resolved %s to %s", hostname, ip);
 
-  sink = nd_cc_sink_new (provider->signalling_client, name, address);
+  sink = nd_cc_sink_new (provider->signalling_client, name, ip);
 
   g_object_unref (resolver);
 
diff --git a/src/nd-cc-sink.h b/src/nd-cc-sink.h
index 71fde4608eef356139fcd4ed6f508c5b22473a59..4d237b54c17701454401662e3e4068f4f6b1f91d 100644
--- a/src/nd-cc-sink.h
+++ b/src/nd-cc-sink.h
@@ -29,7 +29,7 @@ G_DECLARE_FINAL_TYPE (NdCCSink, nd_cc_sink, ND, CC_SINK, GObject)
 
 NdCCSink * nd_cc_sink_new (GSocketClient * client,
                            gchar         * name,
-                           gchar         * remote_address);
+                           gchar         * ip);
 
 NdSinkState nd_cc_sink_get_state (NdCCSink *sink);
 
diff --git a/src/nd-dummy-wfd-sink.c b/src/nd-dummy-wfd-sink.c
index 8715945b686fadddfe3f10d2e8f5ac845ddfe267..b15ff1522b9c6148da737e26031b47b092b7dc5b 100644
--- a/src/nd-dummy-wfd-sink.c
+++ b/src/nd-dummy-wfd-sink.c
@@ -249,9 +249,11 @@ nd_dummy_wfd_sink_sink_start_stream (NdSink *sink)
     }
 
   self->server_source_id = gst_rtsp_server_attach (GST_RTSP_SERVER (self->server), NULL);
-
   if (self->server_source_id == 0)
-    goto error;
+    {
+      g_warning ("NdDummyWFDSink: Unable to attach RTSP server");
+      goto error;
+    }
 
   g_message ("NdDummyWFDSink: You should now be able to connect to rtsp://localhost:7236/wfd1.0");