diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index bd06102a4..7385097fb 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -245,7 +245,7 @@ void qDrawPlot::SetupWidgetWindow(){
 	layout = new QGridLayout;
 		this->setLayout(layout);
 
-		histFrameIndexTitle= histFrameIndexTitle = new QLabel("");
+		histFrameIndexTitle = new QLabel("");
 
 	boxPlot = new QGroupBox("");
 		layout->addWidget(boxPlot,1,0);
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 1dfb33ba3..d98119b63 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -3929,7 +3929,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
 	if(gainval)	delete [] gainval;
 	if(offsetval) delete [] offsetval;
 
-	switch(thisDetector->myDetectorType==MYTHEN){
+	if (thisDetector->myDetectorType==MYTHEN){
 	if (thisDetector->correctionMask&(1<<RATE_CORRECTION)) {
 		int isett=getSettings(imod);
 		double t[]=defaultTDead;
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index 977c62159..c2dc8a261 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -703,8 +703,8 @@ void UDPStandardImplementation::ResetParametersforNewMeasurement() {
 		(*it)->ResetParametersforNewMeasurement();
 
 	if (dataStreamEnable) {
-		char fnametostream[1000];
-		sprintf(fnametostream, "%s/%s", filePath, fileName);
+		char fnametostream[MAX_STR_LENGTH];
+		snprintf(fnametostream, MAX_STR_LENGTH, "%s/%s", filePath, fileName);
 		for (vector<DataStreamer*>::const_iterator it = dataStreamer.begin(); it != dataStreamer.end(); ++it)
 			(*it)->ResetParametersforNewMeasurement(fnametostream);
 	}