diff --git a/communication/message/include/neomessage.h b/communication/message/include/neomessage.h
index 88cf067..934063c 100644
--- a/communication/message/include/neomessage.h
+++ b/communication/message/include/neomessage.h
@@ -2,6 +2,7 @@
 #define __NEOMESSAGE_H_
 
 #include <stdint.h>
+#include <stddef.h>
 
 typedef struct {
 	uint16_t netid;
diff --git a/communication/message/neomessage.cpp b/communication/message/neomessage.cpp
index 190f86b..85830a4 100644
--- a/communication/message/neomessage.cpp
+++ b/communication/message/neomessage.cpp
@@ -18,6 +18,9 @@ neomessage_t icsneo::CreateNeoMessage(const Message& message) {
 		case Network::Type::CAN:
 			((neomessage_can_t*)&neomsg)->arbid = ((const CANMessage*)&message)->arbid;
 			break;
+		default:
+			// TODO Implement others
+			break;
 	}
 
 	return neomsg;
diff --git a/communication/messagedecoder.cpp b/communication/messagedecoder.cpp
index 71efe32..3984346 100644
--- a/communication/messagedecoder.cpp
+++ b/communication/messagedecoder.cpp
@@ -23,6 +23,9 @@ std::shared_ptr<Message> MessageDecoder::decodePacket(const std::shared_ptr<Comm
 				msg->data.push_back(data->data[i]);
 			return msg;
 		}
+		default:
+			// TODO Implement others
+			break;
 	}
 
 	auto msg = std::make_shared<Message>();