diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp
index 4f61d32c7..fd9f3eb7b 100644
--- a/source/shared_lib/sources/platform/common/simple_threads.cpp
+++ b/source/shared_lib/sources/platform/common/simple_threads.cpp
@@ -664,8 +664,9 @@ void LogFileThread::addLogEntry(SystemFlags::DebugType type, string logEntry) {
 
 bool LogFileThread::checkSaveCurrentLogBufferToDisk() {
     bool ret = false;
-    if(difftime(time(NULL),lastSaveToDisk) >= 5 ||
-       LogFileThread::getLogEntryBufferCount() >= 1000000) {
+    if(difftime(time(NULL),lastSaveToDisk) >= 5.0 ||
+		(difftime(time(NULL), lastSaveToDisk) >= 2.0 &&
+         LogFileThread::getLogEntryBufferCount() >= 1000000)) {
         lastSaveToDisk = time(NULL);
         ret = true;
     }
diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index bece9bd75..60de346fb 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -1703,7 +1703,7 @@ bool Socket::isReadable(bool lockMutex) {
 
 	MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
 	if(lockMutex == true) {
-		safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE);
+		//safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE);
 	}
 
 	if(isSocketValid() == false) return false;