diff --git a/slsReceiverSoftware/include/circularFifo.h b/slsReceiverSoftware/include/circularFifo.h
index 580e11654..6a6b39b35 100644
--- a/slsReceiverSoftware/include/circularFifo.h
+++ b/slsReceiverSoftware/include/circularFifo.h
@@ -50,14 +50,8 @@ private:
    unsigned int tail; // input index
    unsigned int head; // output index
    unsigned int Capacity;
-//#ifdef __cplusplus >= 201103L
    mutable sem_t data_mutex;
    mutable sem_t free_mutex;
-//#else
-//   sem_t free_mutex;
-
-//#endif
-
    unsigned int increment(unsigned int idx_) const;
 };
 
diff --git a/slsReceiverSoftware/src/slsReceiver.cpp b/slsReceiverSoftware/src/slsReceiver.cpp
index 838554bb3..b8d74afa1 100644
--- a/slsReceiverSoftware/src/slsReceiver.cpp
+++ b/slsReceiverSoftware/src/slsReceiver.cpp
@@ -42,7 +42,8 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 			{0, 			0, 					0, 	0}
 	};
 
-
+	//initialize global optind variable (required when instantiating multiple receivers in the same process)
+	optind = 1;
 	// getopt_long stores the option index here.
 	int option_index = 0;
 	int c = 0;