diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile
index 4f90d6107..c16db2438 100644
--- a/slsReceiverSoftware/Makefile
+++ b/slsReceiverSoftware/Makefile
@@ -45,9 +45,9 @@ intdoc: $(SRC_H) $(SRC_CLNT)
 
 $(BUILDDIR)/%.o : $(SRCDIR)/%.cpp Makefile
 ifeq ($(ROOTSLS),yes)
-	$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS)  $(ROOTFLAGS) -fPIC  $(EPICSFLAGS) -L/usr/lib64/ #$(FLAGS)
+	$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS)  $(ROOTFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ #$(FLAGS)
 else	
-	$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC  $(EPICSFLAGS) -lpthread #$(FLAGS)
+	$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -lpthread #$(FLAGS)
 endif
 
 lib:  $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a 
diff --git a/slsReceiverSoftware/src/UDPInterface.cpp b/slsReceiverSoftware/src/UDPInterface.cpp
index 3d8ffb767..a0b3d1371 100644
--- a/slsReceiverSoftware/src/UDPInterface.cpp
+++ b/slsReceiverSoftware/src/UDPInterface.cpp
@@ -13,8 +13,9 @@ using namespace std;
 #include "UDPInterface.h"
 #include "UDPBaseImplementation.h"
 #include "UDPStandardImplementation.h"
+#ifdef REST
 #include "UDPRESTImplementation.h"
-
+#endif
 
 
 using namespace std;
@@ -26,11 +27,11 @@ UDPInterface * UDPInterface::create(string receiver_type){
 		cout << "Starting " << receiver_type << endl;
 		return new UDPStandardImplementation();
 	}
-	//#ifdef REST
+#ifdef REST
 	else if (receiver_type == "REST"){
 		return new UDPRESTImplementation();
 	}
-	//#endif
+#endif
 	else{
 		FILE_LOG(logWARNING) << "[ERROR] UDP interface not supported, using standard implementation";
 		return new UDPBaseImplementation();