diff --git a/communication/include/communication.h b/communication/include/communication.h
index 2ee089e..eb24fbf 100644
--- a/communication/include/communication.h
+++ b/communication/include/communication.h
@@ -20,7 +20,7 @@ namespace icsneo {
 
 class Communication {
 public:
-	Communication(std::shared_ptr<ICommunication> com, std::shared_ptr<Packetizer> p, std::shared_ptr<Decoder> md) : impl(com), packetizer(p), decoder(md) {}
+	Communication(std::shared_ptr<ICommunication> com, std::shared_ptr<Packetizer> p, std::shared_ptr<Decoder> md) : packetizer(p), decoder(md), impl(com) {}
 	virtual ~Communication() { close(); }
 
 	bool open();
diff --git a/communication/message/filter/include/main51messagefilter.h b/communication/message/filter/include/main51messagefilter.h
index be07299..d1b2ee0 100644
--- a/communication/message/filter/include/main51messagefilter.h
+++ b/communication/message/filter/include/main51messagefilter.h
@@ -41,6 +41,6 @@ private:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/message/include/main51message.h b/communication/message/include/main51message.h
index f901790..1a5eb61 100644
--- a/communication/message/include/main51message.h
+++ b/communication/message/include/main51message.h
@@ -12,6 +12,6 @@ public:
 	Command command;
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/message/include/serialnumbermessage.h b/communication/message/include/serialnumbermessage.h
index ddf956b..64e7b85 100644
--- a/communication/message/include/serialnumbermessage.h
+++ b/communication/message/include/serialnumbermessage.h
@@ -19,6 +19,6 @@ public:
 	bool hasPCBSerial = false;
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/multichannelcommunication.cpp b/communication/multichannelcommunication.cpp
index 910ab47..01d7367 100644
--- a/communication/multichannelcommunication.cpp
+++ b/communication/multichannelcommunication.cpp
@@ -96,7 +96,7 @@ void MultiChannelCommunication::readTask() {
 						continue;
 					}
 
-					for(auto i = 0; i < currentReadIndex; i++)
+					for(size_t i = 0; i < currentReadIndex; i++)
 						usbReadFifo.pop_front();
 
 					payloadBytes.clear();
diff --git a/communication/packetizer.cpp b/communication/packetizer.cpp
index 1ab4ea1..1e7cd7b 100644
--- a/communication/packetizer.cpp
+++ b/communication/packetizer.cpp
@@ -5,7 +5,7 @@ using namespace icsneo;
 
 uint8_t Packetizer::ICSChecksum(const std::vector<uint8_t>& data) {
 	uint32_t checksum = 0;
-	for(auto i = 0; i < data.size(); i++)
+	for(size_t i = 0; i < data.size(); i++)
 		checksum += data[i];
 	checksum = ~checksum;
 	checksum++;
diff --git a/device/include/device.h b/device/include/device.h
index 5f8a667..9cdff54 100644
--- a/device/include/device.h
+++ b/device/include/device.h
@@ -15,7 +15,7 @@ namespace icsneo {
 
 class Device {
 public:
-	static constexpr char* SERIAL_FIND_ON_OPEN = "xxxxxx";
+	static constexpr const char* SERIAL_FIND_ON_OPEN = "xxxxxx";
 
 	Device(neodevice_t neodevice = {}) {
 		data = neodevice;