diff --git a/dll/base.h b/dll/base.h
index 7e08258d..5999799b 100644
--- a/dll/base.h
+++ b/dll/base.h
@@ -93,7 +93,8 @@ struct Steam_Call_Result {
     Steam_Call_Result(SteamAPICall_t a, int icb, void *r, unsigned int s, double r_in, bool run_cc_cb) {
         api_call = a;
         result.resize(s);
-        memcpy(&(result[0]), r, s);
+        if (s > 0 && r != NULL)
+            memcpy(&(result[0]), r, s);
         created = std::chrono::high_resolution_clock::now();
         run_in = r_in;
         run_call_completed_cb = run_cc_cb;
diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp
index 80f815c5..3f0e5b21 100644
--- a/dll/local_storage.cpp
+++ b/dll/local_storage.cpp
@@ -192,6 +192,8 @@ static std::vector<struct File_Data> get_filenames(std::string strPath)
 
 static std::vector<struct File_Data> get_filenames_recursive(std::string base_path)
 {
+    if (base_path.back() == *PATH_SEPARATOR)
+        base_path.pop_back();
     std::vector<struct File_Data> output;
     std::string strPath = base_path;
     strPath = strPath.append("\\*");
@@ -211,11 +213,12 @@ static std::vector<struct File_Data> get_filenames_recursive(std::string base_pa
                 std::string dir_name = ffd.cFileName;
 
                 std::string path = base_path;
-                path += "\\";
+                path += PATH_SEPARATOR;
                 path += dir_name;
 
                 std::vector<struct File_Data> lower = get_filenames_recursive(path);
-                std::transform(lower.begin(), lower.end(), std::back_inserter(output), [dir_name](File_Data f) {f.name = dir_name + "\\" + f.name; return f;});
+                output.push_back(File_Data{ dir_name });// Is this needed ? Add folder name to the list of files ?
+                std::transform(lower.begin(), lower.end(), std::back_inserter(output), [&dir_name](File_Data f) {f.name = dir_name + "\\" + f.name; return f;});
             } else {
                 File_Data f;
                 f.name = ffd.cFileName;
@@ -354,7 +357,8 @@ static std::vector<struct File_Data> get_filenames_recursive(std::string base_pa
                 path += dir_name;
 
                 std::vector<struct File_Data> lower = get_filenames_recursive(path);
-                std::transform(lower.begin(), lower.end(), std::back_inserter(output), [dir_name](File_Data f) {f.name = dir_name + "/" + f.name; return f;});
+                output.push_back(File_Data{ dir_name });// Is this needed ? Add folder name to the list of files ?
+                std::transform(lower.begin(), lower.end(), std::back_inserter(output), [&dir_name](File_Data f) {f.name = dir_name + "/" + f.name; return f;});
             }
         }
     }
@@ -584,7 +588,19 @@ bool Local_Storage::file_exists(std::string folder, std::string file)
 
     std::string full_path = save_directory + appid + folder + file;
     struct stat buffer;   
-    return (stat (full_path.c_str(), &buffer) == 0);
+
+    if (stat(full_path.c_str(), &buffer) != 0)
+        return false;
+
+#if defined(STEAM_WIN32)
+    if ( buffer.st_mode & _S_IFDIR)
+        return false;
+#else
+    if (S_ISDIR(buffer.st_mode))
+        return false;
+#endif
+
+    return true;
 }
 
 unsigned int Local_Storage::file_size(std::string folder, std::string file)
diff --git a/dll/network.cpp b/dll/network.cpp
index db87adcb..b85ce3f3 100644
--- a/dll/network.cpp
+++ b/dll/network.cpp
@@ -379,7 +379,10 @@ unsigned int receive_buffer_amount(sock_t sock)
 
 static void send_tcp_pending(struct TCP_Socket &socket)
 {
-    int len = send(socket.sock, &(socket.send_buffer[0]), socket.send_buffer.size(), MSG_NOSIGNAL);
+    size_t buf_size = socket.send_buffer.size();
+    if (buf_size == 0) return;
+
+    int len = send(socket.sock, &(socket.send_buffer[0]), buf_size, MSG_NOSIGNAL);
     if (len <= 0) return;
 
     socket.send_buffer.erase(socket.send_buffer.begin(), socket.send_buffer.begin() + len);