diff --git a/src/PlainSession.cpp b/src/PlainSession.cpp
index b2062a533b8bdd382877973a93657464c81f2af7..e6071e6261d81446180d306401516f6993d7e18b 100644
--- a/src/PlainSession.cpp
+++ b/src/PlainSession.cpp
@@ -163,7 +163,7 @@ void PlainSession::startWriteResponse()
 //==============================================================================
 void PlainSession::startWriteData()
 {
-    DEBUG_STREAM << "PlainSession::startWriteData()" << endl;
+    //DEBUG_STREAM << "PlainSession::startWriteData()" << endl;
 
     try
     {
@@ -173,7 +173,7 @@ void PlainSession::startWriteData()
             {
                 int leftToRead = m_inputStreamSize - m_inputStream.tellg();
 
-                DEBUG_STREAM << "PlainSession::startWriteData() left to read " << leftToRead << endl;
+                //DEBUG_STREAM << "PlainSession::startWriteData() left to read " << leftToRead << endl;
 
                 int bufferSize = 0;
 
@@ -182,7 +182,7 @@ void PlainSession::startWriteData()
                 else
                         bufferSize = BUFFER_SIZE;
 
-                DEBUG_STREAM << "PlainSession::startWriteData() buffer size " << bufferSize << endl;
+                //DEBUG_STREAM << "PlainSession::startWriteData() buffer size " << bufferSize << endl;
 
                 std::vector<char> writeBuff;
                 writeBuff.resize(bufferSize);
diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index 41925eacaa34cc25f466e1605bf21f2ef89214f1..c8c7c16b9dc8de97e710adee9c1520d98606a127 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -354,6 +354,12 @@ ResponseSP ProtocolManager::prepareKeepAlive(RequestSP request_sp)
 
     response_sp->set_type(Response::KEEPALIVE);
 
+    m_isTransferRequest = false;
+
+    m_filePath.clear();
+
+    m_fileSize = 0;
+
     return response_sp;
 }
 
diff --git a/src/SSLSession.cpp b/src/SSLSession.cpp
index 9ebcd9498c5d4eca020d74cc6bfc3a4c10f5ddce..13d34fc673232c6704278b49bd3f6818e0c45df1 100644
--- a/src/SSLSession.cpp
+++ b/src/SSLSession.cpp
@@ -198,7 +198,7 @@ void SSLSession::startWriteResponse()
 //==============================================================================
 void SSLSession::startWriteData()
 {
-    DEBUG_STREAM << "SSLSession::startWriteData()" << endl;
+    //DEBUG_STREAM << "SSLSession::startWriteData()" << endl;
 
     try
     {
@@ -208,7 +208,7 @@ void SSLSession::startWriteData()
             {
                 int leftToRead = m_inputStreamSize - m_inputStream.tellg();
 
-                DEBUG_STREAM << "SSLSession::startWriteData() left to read " << leftToRead << endl;
+                //DEBUG_STREAM << "SSLSession::startWriteData() left to read " << leftToRead << endl;
 
                 int bufferSize = 0;
 
@@ -217,7 +217,7 @@ void SSLSession::startWriteData()
                 else
                         bufferSize = BUFFER_SIZE;
 
-                DEBUG_STREAM << "SSLSession::startWriteData() buffer size " << bufferSize << endl;
+                //DEBUG_STREAM << "SSLSession::startWriteData() buffer size " << bufferSize << endl;
 
                 std::vector<char> writeBuff;
                 writeBuff.resize(bufferSize);
diff --git a/src/Session.cpp b/src/Session.cpp
index 15366eef77863bfd8c01d9476594a491ccbde05b..b7472b63e7889edca99a7430f63bda2b0ce90865 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -130,7 +130,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode)
 //==============================================================================
 void Session::handleWriteData(const boost::system::error_code& errorCode)
 {
-    DEBUG_STREAM << "Session::handleWriteData()" << endl;
+    //DEBUG_STREAM << "Session::handleWriteData()" << endl;
 
     if(!errorCode)
     {
@@ -138,12 +138,12 @@ void Session::handleWriteData(const boost::system::error_code& errorCode)
     }
     else if(errorCode == boost::asio::error::eof)
     {
-        DEBUG_STREAM << "Session::handleWriteResponse() end of file from "
+        DEBUG_STREAM << "Session::handleWriteData() end of file from "
             << m_remoteEndpoint << endl;
     }
     else
     {
-        ERROR_STREAM << "Session::handleWriteResponse() "
+        ERROR_STREAM << "Session::handleWriteData() "
             << errorCode.message() << " from " << m_remoteEndpoint << endl;
     }
 }