diff --git a/common/cpp/CMakeLists.txt b/common/cpp/CMakeLists.txt
index f59ad1bcf8f18acae4dc8da02ccd73eb654cb55d..4f29376de775ae22d75dc1891c047d140e5efa91 100644
--- a/common/cpp/CMakeLists.txt
+++ b/common/cpp/CMakeLists.txt
@@ -20,7 +20,8 @@ endif()
 
 install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/common
         DESTINATION include/asapo
-        PATTERN "*.h.in" EXCLUDE)
+        PATTERN "*.h.in" EXCLUDE
+        PATTERN "*/internal" EXCLUDE)
 
 install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/logger
         DESTINATION include/asapo )
diff --git a/common/cpp/include/asapo/common/networking.h b/common/cpp/include/asapo/common/networking.h
index 87346e9150908e179cb4a9b7ca3309f995597071..79f29abb4cefe2095cb06859f11611d0b229d142 100644
--- a/common/cpp/include/asapo/common/networking.h
+++ b/common/cpp/include/asapo/common/networking.h
@@ -68,6 +68,7 @@ struct GenericRequestHeader {
         op_code{i_op_code}, data_id{i_data_id}, data_size{i_data_size}, meta_size{i_meta_size} {
         strncpy(message, i_message.c_str(), kMaxMessageSize);
         strncpy(stream, i_stream.c_str(), kMaxMessageSize);
+        strncpy(api_version,"v0.0", kMaxVersionSize);
     }
 
     Opcode      op_code;
diff --git a/common/cpp/include/asapo/common/version.h.in b/common/cpp/include/asapo/common/version.h.in
index 0eff85ff83950c70c0a7f4f1500e3214e22539a0..5edb453a45dbcdfc94402b7699a08bdf4c99805d 100644
--- a/common/cpp/include/asapo/common/version.h.in
+++ b/common/cpp/include/asapo/common/version.h.in
@@ -29,7 +29,6 @@ inline std::string GetRdsApiVersion() {
     return "@ASAPO_RDS_API_VER@";
 }
 
-
 inline int VersionToNumber(const std::string& version) {
     return int(atof(version.c_str()+2)*1000);
 }
diff --git a/examples/consumer/getnext/getnext.cpp b/examples/consumer/getnext/getnext.cpp
index 495c137fde1039c384b5496a553052c66172e508..ae48a1a29a3594f749523b5e4fe1432f86377b93 100644
--- a/examples/consumer/getnext/getnext.cpp
+++ b/examples/consumer/getnext/getnext.cpp
@@ -19,6 +19,7 @@ std::mutex lock;
 
 uint64_t file_size = 0;
 
+
 inline std::string ConnectionTypeToString(asapo::NetworkConnectionType type) {
     switch (type) {
     case asapo::NetworkConnectionType::kUndefined: