diff --git a/telldus-core/service/DeviceManager.cpp b/telldus-core/service/DeviceManager.cpp
index 8801afbe..0c36ccc5 100644
--- a/telldus-core/service/DeviceManager.cpp
+++ b/telldus-core/service/DeviceManager.cpp
@@ -126,10 +126,10 @@ int DeviceManager::getDeviceMethods(int deviceId, int methodsSupported) {
 
 int DeviceManager::getDeviceMethods(int deviceId) {
 	std::set<int> duplicateDeviceIds;
-	return DeviceManager::getDeviceMethods(deviceId, duplicateDeviceIds);
+	return DeviceManager::getDeviceMethods(deviceId, &duplicateDeviceIds);
 }
 
-int DeviceManager::getDeviceMethods(int deviceId, std::set<int> &duplicateDeviceIds) {
+int DeviceManager::getDeviceMethods(int deviceId, std::set<int> *duplicateDeviceIds) {
 	int type = 0;
 	int methods = 0;
 	std::wstring deviceIds;
@@ -162,16 +162,16 @@ int DeviceManager::getDeviceMethods(int deviceId, std::set<int> &duplicateDevice
 		std::wstringstream devicesstream(deviceIds);
 		methods = 0;
 
-		duplicateDeviceIds.insert(deviceId);
+		duplicateDeviceIds->insert(deviceId);
 
 		while(std::getline(devicesstream, deviceIdBuffer, L',')) {
 			int deviceIdInGroup = TelldusCore::wideToInteger(deviceIdBuffer);
-			if(duplicateDeviceIds.count(deviceIdInGroup) == 1) {
+			if(duplicateDeviceIds->count(deviceIdInGroup) == 1) {
 				// action for device already executed, or will execute, do nothing to avoid infinite loop
 				continue;
 			}
 
-			duplicateDeviceIds.insert(deviceIdInGroup);
+			duplicateDeviceIds->insert(deviceIdInGroup);
 
 			int deviceMethods = getDeviceMethods(deviceIdInGroup, duplicateDeviceIds);
 			if(deviceMethods > 0) {
diff --git a/telldus-core/service/DeviceManager.h b/telldus-core/service/DeviceManager.h
index 152dec12..6a94b7e5 100644
--- a/telldus-core/service/DeviceManager.h
+++ b/telldus-core/service/DeviceManager.h
@@ -52,7 +52,7 @@ public:
 private:
 	void handleSensorMessage(const ControllerMessage &msg);
 	void setSensorValueAndSignal( const std::string &dataType, int dataTypeId, Sensor *sensor, const ControllerMessage &msg, time_t timestamp) const;
-	int getDeviceMethods(int deviceId, std::set<int> &duplicateDeviceIds);
+	int getDeviceMethods(int deviceId, std::set<int> *duplicateDeviceIds);
 	int doGroupAction(const std::wstring deviceIds, int action, unsigned char data, const int type, int groupDeviceId, std::set<int> *duplicateDeviceIds);
 	int executeScene(std::wstring singledevice, int groupDeviceId);
 	bool triggerDeviceStateChange(int deviceId, int intDeviceState, const std::wstring &strDeviceStateValue );
diff --git a/telldus-core/service/Protocol.cpp b/telldus-core/service/Protocol.cpp
index 5a9a58eb..defc7775 100644
--- a/telldus-core/service/Protocol.cpp
+++ b/telldus-core/service/Protocol.cpp
@@ -61,7 +61,7 @@ void Protocol::setModel(const std::wstring &model) {
 	d->model = model;
 }
 
-void Protocol::setParameters(ParameterMap &parameterList) {
+void Protocol::setParameters(const ParameterMap &parameterList) {
 	d->parameterList = parameterList;
 }
 
diff --git a/telldus-core/service/Protocol.h b/telldus-core/service/Protocol.h
index ac48c7a4..c45da20c 100644
--- a/telldus-core/service/Protocol.h
+++ b/telldus-core/service/Protocol.h
@@ -28,7 +28,7 @@ public:
 	virtual int methods() const = 0;
 	std::wstring model() const;
 	void setModel(const std::wstring &model);
-	void setParameters(ParameterMap &parameterList);
+	void setParameters(const ParameterMap &parameterList);
 
 	virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller) = 0;
 
diff --git a/telldus-core/service/ProtocolEverflourish.cpp b/telldus-core/service/ProtocolEverflourish.cpp
index fbd7ae90..069771d6 100644
--- a/telldus-core/service/ProtocolEverflourish.cpp
+++ b/telldus-core/service/ProtocolEverflourish.cpp
@@ -74,7 +74,7 @@ unsigned int ProtocolEverflourish::calculateChecksum(unsigned int x) {
 	int i;
 	unsigned int lo, hi;
 
-	if ((x&0x3) == 3) {
+	if ((x & 0x3) == 3) {
 		lo = x & 0x00ff;
 		hi = x & 0xff00;
 		lo += 4;
@@ -85,7 +85,7 @@ unsigned int ProtocolEverflourish::calculateChecksum(unsigned int x) {
 	}
 
 	for(i = 0; i < 16; i++) {
-		if (x&bit) {
+		if (x & bit) {
 			res = res ^ bits[i];
 		}
 		bit = bit << 1;
@@ -94,7 +94,7 @@ unsigned int ProtocolEverflourish::calculateChecksum(unsigned int x) {
 	return res;
 }
 
-std::string ProtocolEverflourish::decodeData(ControllerMessage &dataMsg) {
+std::string ProtocolEverflourish::decodeData(const ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");
 	unsigned int allData;
 	unsigned int house = 0;
diff --git a/telldus-core/service/ProtocolEverflourish.h b/telldus-core/service/ProtocolEverflourish.h
index 4118407f..ae4abf7c 100644
--- a/telldus-core/service/ProtocolEverflourish.h
+++ b/telldus-core/service/ProtocolEverflourish.h
@@ -15,7 +15,7 @@ class ProtocolEverflourish :  public Protocol {
 public:
 	int methods() const;
 	virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
-	static std::string decodeData(ControllerMessage &dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 
 private:
 	static unsigned int calculateChecksum(unsigned int x);
diff --git a/telldus-core/service/ProtocolFineoffset.cpp b/telldus-core/service/ProtocolFineoffset.cpp
index d7b8119e..daa3635e 100644
--- a/telldus-core/service/ProtocolFineoffset.cpp
+++ b/telldus-core/service/ProtocolFineoffset.cpp
@@ -11,7 +11,7 @@
 #include <string>
 #include "common/Strings.h"
 
-std::string ProtocolFineoffset::decodeData(ControllerMessage &dataMsg) {
+std::string ProtocolFineoffset::decodeData(const ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");
 	if (data.length() < 8) {
 		return "";
diff --git a/telldus-core/service/ProtocolFineoffset.h b/telldus-core/service/ProtocolFineoffset.h
index 94894f2e..b3bc3ce1 100644
--- a/telldus-core/service/ProtocolFineoffset.h
+++ b/telldus-core/service/ProtocolFineoffset.h
@@ -13,7 +13,7 @@
 
 class ProtocolFineoffset : public Protocol {
 public:
-	static std::string decodeData(ControllerMessage &dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 };
 
 #endif  // TELLDUS_CORE_SERVICE_PROTOCOLFINEOFFSET_H_
diff --git a/telldus-core/service/ProtocolHasta.cpp b/telldus-core/service/ProtocolHasta.cpp
index d89c4830..0c5899de 100644
--- a/telldus-core/service/ProtocolHasta.cpp
+++ b/telldus-core/service/ProtocolHasta.cpp
@@ -26,8 +26,8 @@ std::string ProtocolHasta::getStringForMethod(int method, unsigned char, Control
 	strReturn.append(1, 190);
 	strReturn.append(1, 190);
 
-	strReturn.append(convertByte( (house&0xFF) ));
-	strReturn.append(convertByte( (house>>8)&0xFF ));
+	strReturn.append(convertByte( (house & 0xFF) ));
+	strReturn.append(convertByte( (house>>8) & 0xFF ));
 
 	int byte = unit&0x0F;
 
diff --git a/telldus-core/service/ProtocolMandolyn.cpp b/telldus-core/service/ProtocolMandolyn.cpp
index fd720893..555f67d0 100644
--- a/telldus-core/service/ProtocolMandolyn.cpp
+++ b/telldus-core/service/ProtocolMandolyn.cpp
@@ -11,7 +11,7 @@
 #include <string>
 #include "common/Strings.h"
 
-std::string ProtocolMandolyn::decodeData(ControllerMessage &dataMsg) {
+std::string ProtocolMandolyn::decodeData(const ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");
 	uint32_t value = (uint32_t)TelldusCore::hexTo64l(data);
 
diff --git a/telldus-core/service/ProtocolMandolyn.h b/telldus-core/service/ProtocolMandolyn.h
index ee9a69cd..8fcd90a5 100644
--- a/telldus-core/service/ProtocolMandolyn.h
+++ b/telldus-core/service/ProtocolMandolyn.h
@@ -13,7 +13,7 @@
 
 class ProtocolMandolyn : public Protocol {
 public:
-	static std::string decodeData(ControllerMessage &dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 };
 
 #endif  // TELLDUS_CORE_SERVICE_PROTOCOLMANDOLYN_H_
diff --git a/telldus-core/service/ProtocolNexa.cpp b/telldus-core/service/ProtocolNexa.cpp
index 00e39e77..8c95514a 100644
--- a/telldus-core/service/ProtocolNexa.cpp
+++ b/telldus-core/service/ProtocolNexa.cpp
@@ -164,7 +164,7 @@ std::string ProtocolNexa::getStringSelflearningForCode(int intHouse, int intCode
 	return strMessage;
 }
 
-std::string ProtocolNexa::decodeData(ControllerMessage& dataMsg) {
+std::string ProtocolNexa::decodeData(const ControllerMessage& dataMsg) {
 	uint32_t allData = 0;
 
 	sscanf(dataMsg.getParameter("data").c_str(), "%lx", (long*)&allData);  // NOLINT(runtime/int)
diff --git a/telldus-core/service/ProtocolNexa.h b/telldus-core/service/ProtocolNexa.h
index 4ed480c8..7b65ae8f 100644
--- a/telldus-core/service/ProtocolNexa.h
+++ b/telldus-core/service/ProtocolNexa.h
@@ -16,7 +16,7 @@ class ProtocolNexa : public Protocol {
 public:
 	virtual int methods() const;
 	virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
-	static std::string decodeData(ControllerMessage& dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 
 protected:
 	std::string getStringSelflearning(int method, unsigned char data);
diff --git a/telldus-core/service/ProtocolOregon.cpp b/telldus-core/service/ProtocolOregon.cpp
index 6870929d..062c33af 100644
--- a/telldus-core/service/ProtocolOregon.cpp
+++ b/telldus-core/service/ProtocolOregon.cpp
@@ -11,7 +11,7 @@
 #include <string>
 #include "common/Strings.h"
 
-std::string ProtocolOregon::decodeData(ControllerMessage &dataMsg) {
+std::string ProtocolOregon::decodeData(const ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");
 
 	std::wstring model = dataMsg.model();
diff --git a/telldus-core/service/ProtocolOregon.h b/telldus-core/service/ProtocolOregon.h
index bfa9662a..1da70dc1 100644
--- a/telldus-core/service/ProtocolOregon.h
+++ b/telldus-core/service/ProtocolOregon.h
@@ -13,7 +13,7 @@
 
 class ProtocolOregon : public Protocol {
 public:
-	static std::string decodeData(ControllerMessage &dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 
 protected:
 	static std::string decodeEA4C(const std::string &data);
diff --git a/telldus-core/service/ProtocolSartano.cpp b/telldus-core/service/ProtocolSartano.cpp
index 1476dff3..bb36d5a0 100644
--- a/telldus-core/service/ProtocolSartano.cpp
+++ b/telldus-core/service/ProtocolSartano.cpp
@@ -41,7 +41,7 @@ std::string ProtocolSartano::getStringForCode(const std::wstring &strCode, int m
 	return strReturn;
 }
 
-std::string ProtocolSartano::decodeData(ControllerMessage &dataMsg) {
+std::string ProtocolSartano::decodeData(const ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");
 	signed int allDataIn;
 	signed int allData = 0;
diff --git a/telldus-core/service/ProtocolSartano.h b/telldus-core/service/ProtocolSartano.h
index 1480be83..d644a0e8 100644
--- a/telldus-core/service/ProtocolSartano.h
+++ b/telldus-core/service/ProtocolSartano.h
@@ -15,7 +15,7 @@ class ProtocolSartano : public Protocol {
 public:
 	int methods() const;
 	virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
-	static std::string decodeData(ControllerMessage &dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 
 protected:
 	std::string getStringForCode(const std::wstring &code, int method);
diff --git a/telldus-core/service/ProtocolWaveman.cpp b/telldus-core/service/ProtocolWaveman.cpp
index bc784720..77a7a1bf 100644
--- a/telldus-core/service/ProtocolWaveman.cpp
+++ b/telldus-core/service/ProtocolWaveman.cpp
@@ -24,7 +24,7 @@ std::string ProtocolWaveman::getOffCode() const {
 	return "$k$k$k$k$k$k$k$k$k+";
 }
 
-std::string ProtocolWaveman::decodeData(ControllerMessage& dataMsg) {
+std::string ProtocolWaveman::decodeData(const ControllerMessage& dataMsg) {
 	uint32_t allData = 0;
 	unsigned int house = 0;
 	unsigned int unit = 0;
diff --git a/telldus-core/service/ProtocolWaveman.h b/telldus-core/service/ProtocolWaveman.h
index 200066fd..a6feb394 100644
--- a/telldus-core/service/ProtocolWaveman.h
+++ b/telldus-core/service/ProtocolWaveman.h
@@ -14,7 +14,7 @@ class ProtocolWaveman : public ProtocolNexa {
 public:
 	int methods() const;
 	virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
-	static std::string decodeData(ControllerMessage& dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 
 protected:
 	virtual std::string getOffCode() const;
diff --git a/telldus-core/service/ProtocolX10.cpp b/telldus-core/service/ProtocolX10.cpp
index 9128f689..a5883627 100644
--- a/telldus-core/service/ProtocolX10.cpp
+++ b/telldus-core/service/ProtocolX10.cpp
@@ -113,7 +113,7 @@ std::string ProtocolX10::getStringForMethod(int method, unsigned char data, Cont
 	return strReturn;
 }
 
-std::string ProtocolX10::decodeData(ControllerMessage& dataMsg) {
+std::string ProtocolX10::decodeData(const ControllerMessage& dataMsg) {
 	int intData = 0, currentBit = 31;
 	bool method = 0;
 	sscanf(dataMsg.getParameter("data").c_str(), "%X", &intData);
diff --git a/telldus-core/service/ProtocolX10.h b/telldus-core/service/ProtocolX10.h
index 7977399a..c8cf8422 100644
--- a/telldus-core/service/ProtocolX10.h
+++ b/telldus-core/service/ProtocolX10.h
@@ -16,7 +16,7 @@ public:
 	int methods() const;
 	virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
 
-	static std::string decodeData(ControllerMessage& dataMsg);
+	static std::string decodeData(const ControllerMessage &dataMsg);
 };
 
 #endif  // TELLDUS_CORE_SERVICE_PROTOCOLX10_H_