diff --git a/demo/main.cpp b/demo/main.cpp
index ee80a81..28cd536 100644
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -2,7 +2,7 @@
 #include "matador/sql/connection.hpp"
 #include "matador/sql/query_macro.hpp"
 
-#include "matador/query/condition.hpp"
+#include "matador/query/criteria.hpp"
 
 #include "matador/object/object_ptr.hpp"
 #include "matador/object/repository.hpp"
diff --git a/include/matador/orm/session_query_builder.hpp b/include/matador/orm/session_query_builder.hpp
index ae3e45b..fae7e38 100644
--- a/include/matador/orm/session_query_builder.hpp
+++ b/include/matador/orm/session_query_builder.hpp
@@ -28,7 +28,7 @@ struct entity_query_data {
   std::vector<sql::column> columns{};
   std::unordered_map<std::string, sql::statement> lazy_loading_statements{};
   std::vector<query::join_data> joins{};
-  query::criteria_ptr where_clause;
+  query::criteria_ptr where_clause{};
 };
 
 class criteria_transformer final : public query::criteria_visitor {
diff --git a/source/orm/orm/session_query_builder.cpp b/source/orm/orm/session_query_builder.cpp
index c84287f..1807c70 100644
--- a/source/orm/orm/session_query_builder.cpp
+++ b/source/orm/orm/session_query_builder.cpp
@@ -15,7 +15,7 @@ void criteria_transformer::visit( const query::binary_criteria& node ) {
   update_criteria_column(node);
 }
 
-void criteria_transformer::visit( const query::binary_column_criteria& node ) {}
+void criteria_transformer::visit( const query::binary_column_criteria& /*node*/ ) {}
 
 void criteria_transformer::visit( const query::collection_criteria& node ) {
   update_criteria_column(node);
diff --git a/test/backends/StatementTest.cpp b/test/backends/StatementTest.cpp
index 18d0c2b..269319e 100644
--- a/test/backends/StatementTest.cpp
+++ b/test/backends/StatementTest.cpp
@@ -47,13 +47,18 @@ protected:
   };
 };
 
+// template<class Type>
+// std::vector<matador::utils::placeholder> to_placeholder() {
+  // return placeholder_generator::generate<Type>();
+// }
 TEST_CASE_METHOD(StatementTestFixture, "Create prepared statement", "[statement]") {
   using namespace matador::utils;
   REQUIRE(repo.attach<airplane>("airplane"));
   table ap{"airplane"};
   SECTION("Insert with prepared statement and placeholder") {
     auto stmt = query::insert()
-    .into("airplane", column_generator::generate<airplane>(repo, true))
+    .into("airplane", generator::placeholder<airplane>())
+    // .into("airplane", column_generator::generate<airplane>(repo, true))
     .values<airplane>()
     .prepare(db);
     REQUIRE(stmt.is_ok());