diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 627a2072d..f33ff1035 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -42,7 +42,7 @@
 #include <netdb.h>
 #include <i18n.h>
 
-#define MAX_BUF 1024
+#define MAX_BUF 16384
 
 ////////////////////////////////////////////////////////////////////////////////
 static void gnutls_log_function (int level, const char* message)
@@ -196,7 +196,7 @@ void TLSClient::send (const std::string& data)
   int total = 0;
   int remaining = packet.length ();
 
-  while (total < remaining)
+  while (total < packet.length ())
   {
     int status;
     do
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 8fc191fcc..e97ea6914 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -26,7 +26,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <iostream>
 #include <sstream>
 #include <inttypes.h>
 #include <Context.h>