diff --git a/include/sp/io/IOInterface.h b/include/sp/io/IOInterface.h
index 65c19f7..3ab050b 100644
--- a/include/sp/io/IOInterface.h
+++ b/include/sp/io/IOInterface.h
@@ -20,7 +20,6 @@ class Stream {
 	IOInterface<IOTag> m_Interface;
 
 	using MessageBase = typename MessageDispatcher::MessageBaseType;
-	using MsgIdType = typename MessageBase::MsgIdType;
 
   public:
 	Stream() {}
diff --git a/include/sp/io/IOInterfaceImpl.inl b/include/sp/io/IOInterfaceImpl.inl
index 8c19734..501c30a 100644
--- a/include/sp/io/IOInterfaceImpl.inl
+++ b/include/sp/io/IOInterfaceImpl.inl
@@ -8,7 +8,8 @@ template <typename IOTag, typename MessageDispatcher, typename MessageFactory>
 Stream<IOTag, MessageDispatcher, MessageFactory>::Stream(IOInterface<IOTag>&& a_Interface) : m_Interface(std::move(a_Interface)) {}
 
 template <typename IOTag, typename MessageDispatcher, typename MessageFactory>
-Stream<IOTag, MessageDispatcher, MessageFactory>::Stream(Stream<IOTag, MessageDispatcher, MessageFactory>&& a_Stream) : m_Dispatcher(std::move(a_Stream.m_Dispatcher)), m_Interface(std::move(a_Stream.m_Interface)) {}
+Stream<IOTag, MessageDispatcher, MessageFactory>::Stream(Stream<IOTag, MessageDispatcher, MessageFactory>&& a_Stream) :
+	m_Dispatcher(std::move(a_Stream.m_Dispatcher)), m_Interface(std::move(a_Stream.m_Interface)) {}
 
 template <typename IOTag, typename MessageDispatcher, typename MessageFactory>
 void Stream<IOTag, MessageDispatcher, MessageFactory>::SendMessage(const MessageBase& a_Message) {
@@ -59,12 +60,12 @@ void Stream<IOTag, MessageDispatcher, MessageFactory>::RecieveMessages() {
 
 		// TODO: process compress + encryption
 
-		MsgIdType packetType;
+		VarInt packetType;
 		buffer >> packetType;
 
 		static const MessageFactory messageFactory;
 
-		std::unique_ptr<MessageBase> message = messageFactory.CreateMessage(packetType);
+		std::unique_ptr<MessageBase> message = messageFactory.CreateMessage(packetType.GetValue());
 
 		assert(message != nullptr);
 
diff --git a/include/sp/protocol/message/MessageInterfacesImpl.h b/include/sp/protocol/message/MessageInterfacesImpl.h
index e04f054..f3f5ecb 100644
--- a/include/sp/protocol/message/MessageInterfacesImpl.h
+++ b/include/sp/protocol/message/MessageInterfacesImpl.h
@@ -117,7 +117,7 @@ template <typename TBase>
 class MessageInterfaceWriteIdBase : public TBase {
   public:
 	void Write(DataBuffer& buffer) const {
-		this->WriteData(this->GetId(), buffer);
+		buffer << VarInt{this->GetId()};
 		this->WriteImpl(buffer);
 	}