diff --git a/MQTTSNGateway/Makefile b/MQTTSNGateway/Makefile
index 0591067..fa5ad97 100644
--- a/MQTTSNGateway/Makefile
+++ b/MQTTSNGateway/Makefile
@@ -62,14 +62,16 @@ $(SUBDIR)/MQTTSNUnsubscribeServer.c
 CXX := g++
 CPPFLAGS += 
 
-INCLUDES += -I$(SRCDIR) \
+INCLUDE :=
+INCLUDES += $(INCLUDE) -I$(SRCDIR) \
 -I$(SRCDIR)/$(OS) \
 -I$(SRCDIR)/$(OS)/$(SENSORNET) \
 -I$(SUBDIR) \
 -I$(SRCDIR)/$(TEST)
 
 DEFS :=
-LIBS += -L/usr/local/lib
+LIB :=
+LIBS += $(LIB) -L/usr/local/lib
 LDFLAGS := 
 CXXFLAGS := -Wall -O3 -std=c++11
 LDADD := -lpthread -lssl -lcrypto -lrt
diff --git a/MQTTSNGateway/src/MQTTSNGWClient.cpp b/MQTTSNGateway/src/MQTTSNGWClient.cpp
index 19c7b91..9a8a043 100644
--- a/MQTTSNGateway/src/MQTTSNGWClient.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClient.cpp
@@ -230,12 +230,10 @@ Client* ClientList::createClient(SensorNetAddress* addr, MQTTSNString* clientId,
 	else
 	{
 		MQTTSNString  dummyId;
-		char* id = (char*)malloc(1);
-		*id = 0;
-		dummyId.cstring = id;
+		dummyId.cstring = strdup("");
 		dummyId.lenstring.len = 0;
 		client->setClientId(dummyId);
-		free(id);
+		 free(dummyId.cstring);
 	}
 
 	/* add the list */