diff --git a/CMakeLists.txt b/CMakeLists.txt
index f61fbe562f33f19f8998659f554851accf01f914..8dcc7c2f1df03b70fbf48ee48c41fb45be52ef8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,7 @@ target_link_libraries(ccaosdb
     ${CONAN_LIBS}
 )
 
-add_executable(ccaosdbcli src/ccaosdbcli.c)
+add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c)
 target_include_directories(ccaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
@@ -189,7 +189,7 @@ target_link_libraries(ccaosdbcli
     ${CONAN_LIBS}
 )
 
-add_executable(cxxcaosdbcli src/cxxcaosdbcli.cpp)
+add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp)
 target_include_directories(cxxcaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
diff --git a/include/caosdb/configuration.h b/include/caosdb/configuration.h
index 6426ab4b9e5b6dbfebb3cce4d67983df58a57a6a..80bc927018cb625d045e4f7379555b5a90d7b9b5 100644
--- a/include/caosdb/configuration.h
+++ b/include/caosdb/configuration.h
@@ -26,9 +26,10 @@
 #include "boost/json/object.hpp"           // for object
 #include "boost/json/value.hpp"            // for value
 #include "boost/json/value_ref.hpp"        // IWYU pragma: keep
-#include "caosdb/authentication.h"         // for Authenticator, PlainPassw...
-#include "caosdb/certificate_provider.h"   // for CertificateProvider, path
-#include "caosdb/exceptions.h"             // for ConfigurationError
+// IWYU pragma: no_include "boost/json/fwd.hpp"
+#include "caosdb/authentication.h"       // for Authenticator, PlainPassw...
+#include "caosdb/certificate_provider.h" // for CertificateProvider, path
+#include "caosdb/exceptions.h"           // for ConfigurationError
 #include "caosdb/logging.h"
 #include "caosdb/utility.h"              // for load_json_file
 #include "grpcpp/security/credentials.h" // for ChannelCredentials
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index 7dd4a71558de93b703ac959909692065ea8e0725..66bfac7b98e6f404076f6fbcab82dde563c8be12 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -154,8 +154,9 @@ auto Transaction::InsertEntity(Entity *entity) -> void {
 
 auto Transaction::Execute() -> TransactionStatus {
   ExecuteAsynchronously();
-  this->status.ThrowExceptionIfError();
-  return this->status;
+  auto status = WaitForIt();
+  status.ThrowExceptionIfError();
+  return status;
 }
 
 auto Transaction::ExecuteAsynchronously() noexcept -> void {