diff --git a/arangod/Aql/ExecutionPlan.cpp b/arangod/Aql/ExecutionPlan.cpp
index 4fcda543e4..46da2cb43f 100644
--- a/arangod/Aql/ExecutionPlan.cpp
+++ b/arangod/Aql/ExecutionPlan.cpp
@@ -1016,8 +1016,6 @@ void ExecutionPlan::unlinkNodes (std::unordered_set<ExecutionNode*>& toRemove) {
 ////////////////////////////////////////////////////////////////////////////////
 
 void ExecutionPlan::unlinkNode (ExecutionNode* node) {
-  checkLinkage();
-  std::cout << toJson(TRI_UNKNOWN_MEM_ZONE, true).toString() << std::endl;
   auto parents = node->getParents();
   if (parents.empty()) {
     THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
@@ -1035,8 +1033,6 @@ void ExecutionPlan::unlinkNode (ExecutionNode* node) {
       node->removeDependency(x);
     }
   }
-  std::cout << toJson(TRI_UNKNOWN_MEM_ZONE, true).toString() << std::endl;
-  checkLinkage();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/arangod/VocBase/transaction.cpp b/arangod/VocBase/transaction.cpp
index 962f656947..6aa8700bb2 100644
--- a/arangod/VocBase/transaction.cpp
+++ b/arangod/VocBase/transaction.cpp
@@ -865,7 +865,7 @@ int TRI_AddCollectionTransaction (TRI_transaction_t* trx,
   }
 
   // check if we already have got this collection in the _collections vector
-  size_t position;
+  size_t position = 0;
   TRI_transaction_collection_t* trxCollection = FindCollection(trx, cid, &position);
 
   if (trxCollection != nullptr) {
diff --git a/lib/ProgramOptions/program-options.cpp b/lib/ProgramOptions/program-options.cpp
index 2b556260e8..f18dfa9a69 100644
--- a/lib/ProgramOptions/program-options.cpp
+++ b/lib/ProgramOptions/program-options.cpp
@@ -1410,7 +1410,7 @@ bool TRI_ParseArgumentsProgramOptions (TRI_program_options_t * options,
   extern int optind;
 
   TRI_string_buffer_t buffer;
-  TRI_PO_item_t * item;
+  TRI_PO_item_t* item = nullptr;
   const char* shortOptions;
   size_t i;
   int idx;