diff --git a/src/Messenger/MessageInStream.cpp b/src/Messenger/MessageInStream.cpp
index f20992d..1c3840d 100644
--- a/src/Messenger/MessageInStream.cpp
+++ b/src/Messenger/MessageInStream.cpp
@@ -153,8 +153,6 @@ void MessageInStream::receiveFramePayloadHandler(const common::DataConstBuffer&
         promise_->resolve(std::move(message_));
         promise_.reset();
         isResolved = true;
-
-        currentMessageIndex_--;
     } else {
         // First or Middle message, we'll store in our buffer...
         messageBuffer_[message_->getChannelId()] = std::move(message_);
diff --git a/src/Transport/SSLWrapper.cpp b/src/Transport/SSLWrapper.cpp
index f07f983..e4fc96a 100644
--- a/src/Transport/SSLWrapper.cpp
+++ b/src/Transport/SSLWrapper.cpp
@@ -39,7 +39,6 @@ SSLWrapper::SSLWrapper()
 
 SSLWrapper::~SSLWrapper()
 {
-    FIPS_mode_set(0);
     ENGINE_cleanup();
     CONF_modules_unload(1);
     EVP_cleanup();