diff --git a/file/include/files/FileServer.h b/file/include/files/FileServer.h
index 929b87d..f702374 100644
--- a/file/include/files/FileServer.h
+++ b/file/include/files/FileServer.h
@@ -172,7 +172,7 @@ namespace ts::server::file {
     }
 
     namespace transfer {
-        typedef uint32_t transfer_id;
+        typedef uint16_t transfer_id;
 
         struct Transfer {
             transfer_id server_transfer_id{0};
diff --git a/server/src/client/command_handler/misc.cpp b/server/src/client/command_handler/misc.cpp
index 0e441e6..19883b4 100644
--- a/server/src/client/command_handler/misc.cpp
+++ b/server/src/client/command_handler/misc.cpp
@@ -2533,7 +2533,7 @@ command_result ConnectedClient::handleCommandConversationHistory(ts::Command &co
 
     auto conversation_id = command[0]["cid"].as<ChannelId>();
     /* test if we have access to the conversation */
-    {
+    if(conversation_id > 0) {
         /* test if we're able to see the channel */
         {
             shared_lock channel_view_lock(this->channel_lock);
@@ -2650,7 +2650,7 @@ command_result ConnectedClient::handleCommandConversationFetch(ts::Command &cmd)
         result_bulk["cid"] = conversation_id;
 
         /* test if we have access to the conversation */
-        {
+        if(conversation_id > 0) {
             /* test if we're able to see the channel */
             {
                 shared_lock channel_view_lock(this->channel_lock);
diff --git a/shared b/shared
index 7a38548..a4d7c90 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 7a3854843fac3416a75d71f032c7a012d9ea1107
+Subproject commit a4d7c90945525aad35c1280ebfd0d0d8cc7cd197