diff --git a/src/cc/Httpd.cpp b/src/cc/Httpd.cpp
index 396d42fa..31bb6784 100644
--- a/src/cc/Httpd.cpp
+++ b/src/cc/Httpd.cpp
@@ -44,7 +44,7 @@ bool Httpd::start()
     }
 
     m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, static_cast<uint16_t>(m_options->ccPort()), nullptr, nullptr, &Httpd::handler,
-                                this, MHD_OPTION_END);
+                                this, MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 10, MHD_OPTION_END);
 
     if (!m_daemon) {
         LOG_ERR("HTTP Daemon failed to start.");
diff --git a/src/cc/Service.cpp b/src/cc/Service.cpp
index ba234bad..e4c05494 100644
--- a/src/cc/Service.cpp
+++ b/src/cc/Service.cpp
@@ -82,6 +82,8 @@ unsigned Service::handleGET(const Options* options, const std::string& url, cons
         }
     }
 
+    LOG_INFO("Resp. lengt: %d", resp.length());
+
     uv_mutex_unlock(&m_mutex);
 
     return resultCode;
@@ -134,7 +136,7 @@ unsigned Service::getClientConfig(const Options* options, const std::string& cli
         document.Parse(data.str().c_str());
 
         if (!document.HasParseError()) {
-            rapidjson::StringBuffer buffer(0, 65536);
+            rapidjson::StringBuffer buffer(0, 4096);
             rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
             writer.SetMaxDecimalPlaces(10);
             document.Accept(writer);