diff --git a/server/src/ngsi.c b/server/src/ngsi.c
index 9474d0736..24bf9d72d 100644
--- a/server/src/ngsi.c
+++ b/server/src/ngsi.c
@@ -19,6 +19,7 @@
 #include <curl/curl.h>
 #include <uuid/uuid.h>
 #include <jansson.h>
+#include <pthread.h>
 
 #include "ngsi.h"
 #include "utils.h"
@@ -96,9 +97,13 @@ static int ngsi_request(CURL *handle, const char *endpoint, const char *operatio
 	curl_easy_setopt(handle, CURLOPT_POSTFIELDSIZE, strlen(post));
 	curl_easy_setopt(handle, CURLOPT_POSTFIELDS, post);
 	
-	debug(20, "Request to context broker:\n%s", post);
-	
+	debug(18, "Request to context broker: %s\n%s", url, post);
+
+	int old; /* We don't want to leave the CUrl handle in an invalid state */
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old);
 	CURLcode ret = curl_easy_perform(handle);
+	pthread_setcancelstate(old, NULL);
+
 	if (ret)
 		error("HTTP request failed: %s", curl_easy_strerror(ret));
 
diff --git a/server/src/server.c b/server/src/server.c
index 2e2d6f0af..16002c25b 100644
--- a/server/src/server.c
+++ b/server/src/server.c
@@ -48,7 +48,7 @@ static void quit()
 	list_destroy(&nodes);
 	config_destroy(&config);
 
-	info("Goodbye!");
+	info(GRN("Goodbye!"));
 
 	_exit(EXIT_SUCCESS);
 }