diff --git a/src/XrdCl/XrdClChannel.cc b/src/XrdCl/XrdClChannel.cc
index abed4230a20..e88df6b3031 100644
--- a/src/XrdCl/XrdClChannel.cc
+++ b/src/XrdCl/XrdClChannel.cc
@@ -367,7 +367,7 @@ namespace XrdCl
   //------------------------------------------------------------------------
   void Channel::SetOnConnectHandler( Job *onConnJob )
   {
-    pStreams[0]->SetOnConnectHandler( onConnJob );
+    pStream->SetOnConnectHandler( onConnJob );
   }
 
   //----------------------------------------------------------------------------
diff --git a/src/XrdCl/XrdClInQueue.cc b/src/XrdCl/XrdClInQueue.cc
index 71ea7738b52..e6256649cdb 100644
--- a/src/XrdCl/XrdClInQueue.cc
+++ b/src/XrdCl/XrdClInQueue.cc
@@ -222,7 +222,7 @@ namespace XrdCl
     {
       if( it->second.second <= now )
       {
-        it->second.first->OnStreamEvent( IncomingMsgHandler::Timeout,
+        uint8_t act = it->second.first->OnStreamEvent( IncomingMsgHandler::Timeout,
                                          Status( stError, errOperationExpired ) );
         auto next = it; ++next;
         if( act & IncomingMsgHandler::RemoveHandler )
diff --git a/src/XrdCl/XrdClStream.cc b/src/XrdCl/XrdClStream.cc
index 161619026d7..5967f254f1f 100644
--- a/src/XrdCl/XrdClStream.cc
+++ b/src/XrdCl/XrdClStream.cc
@@ -34,6 +34,7 @@
 #include "XrdCl/XrdClMonitor.hh"
 #include "XrdCl/XrdClMessageUtils.hh"
 #include "XrdCl/XrdClXRootDTransport.hh"
+#include "XrdCl/XrdClXRootDMsgHandler.hh"
 #include "XrdClAsyncSocketHandler.hh"
 
 #include <sys/types.h>
diff --git a/src/XrdCl/XrdClXRootDTransport.cc b/src/XrdCl/XrdClXRootDTransport.cc
index fd2053824e6..e26ddeb8bed 100644
--- a/src/XrdCl/XrdClXRootDTransport.cc
+++ b/src/XrdCl/XrdClXRootDTransport.cc
@@ -204,7 +204,7 @@ namespace XrdCl
       protection(0),
       protRespBody(0),
       protRespSize(0),
-      strmSelector(0)
+      strmSelector(0),
       encrypted(false)
     {
       sidManager = new SIDManager();
diff --git a/src/XrdCl/XrdClXRootDTransport.hh b/src/XrdCl/XrdClXRootDTransport.hh
index 776bb4b2971..7fb0e7b5272 100644
--- a/src/XrdCl/XrdClXRootDTransport.hh
+++ b/src/XrdCl/XrdClXRootDTransport.hh
@@ -234,6 +234,13 @@ namespace XrdCl
       //------------------------------------------------------------------------
       virtual Status GetSignature( Message *toSign, Message *&sign,
                                    AnyObject &channelData );
+
+      //------------------------------------------------------------------------
+      //! Get signature for given message
+      //------------------------------------------------------------------------
+      virtual Status GetSignature( Message *toSign, Message *&sign,
+                                   XRootDChannelInfo *info );
+
       //------------------------------------------------------------------------
       //! Wait until the program can safely exit
       //------------------------------------------------------------------------