diff --git a/intercept b/intercept
index 3302bbc..4beef81 160000
--- a/intercept
+++ b/intercept
@@ -1 +1 @@
-Subproject commit 3302bbc3fe002f9d1482e2aad7b386c9ec101a79
+Subproject commit 4beef8197bc7c1a62f4ccf931ad355f9ee5dea6d
diff --git a/mariadb-connector-c b/mariadb-connector-c
index 256ac9f..bec589e 160000
--- a/mariadb-connector-c
+++ b/mariadb-connector-c
@@ -1 +1 @@
-Subproject commit 256ac9fdf84089844e5f99e7995b4a2d8721c231
+Subproject commit bec589e679c68791bd98b4d55d60c503e2729302
diff --git a/mariadbpp b/mariadbpp
index e93524f..6c7cb8a 160000
--- a/mariadbpp
+++ b/mariadbpp
@@ -1 +1 @@
-Subproject commit e93524ff7b9cdea6e5accbd4b52b106ac12410eb
+Subproject commit 6c7cb8aca1177c5ec73afe9aaf78a548710fec93
diff --git a/src/connection.cpp b/src/connection.cpp
index 8159cac..76c262c 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -18,7 +18,7 @@ class GameDataDBConnection : public game_data {
 public:
     GameDataDBConnection() {}
     void lastRefDeleted() const override { delete this; }
-    const sqf_script_type& type() const override { return Connection::GameDataDBConnection_type; }
+    const sqf_script_type& type() const override { return *Connection::GameDataDBConnection_type; }
     ~GameDataDBConnection() override {};
 
     bool get_as_bool() const override { return true; }
diff --git a/src/connection.h b/src/connection.h
index 79fb793..9d20e8e 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -25,7 +25,7 @@ class Connection {
 
 
 	static void initCommands();
-	static inline sqf_script_type GameDataDBConnection_type;
+	static inline sqf_script_type* GameDataDBConnection_type;
 	static inline game_data_type GameDataDBConnection_typeE;
 
 
diff --git a/src/query.h b/src/query.h
index a3ef208..4632bfd 100644
--- a/src/query.h
+++ b/src/query.h
@@ -25,7 +25,7 @@ class Query {
 
 
 	static void initCommands();
-	static inline sqf_script_type GameDataDBQuery_type;
+	static inline sqf_script_type* GameDataDBQuery_type;
 	static inline game_data_type GameDataDBQuery_typeE;
 
     static inline types::registered_sqf_function handle_cmd_prepareQuery;
@@ -45,7 +45,7 @@ class GameDataDBQuery : public game_data {
 public:
     GameDataDBQuery() {}
     void lastRefDeleted() const override { delete this; }
-    const sqf_script_type& type() const override { return Query::GameDataDBQuery_type; }
+    const sqf_script_type& type() const override { return *Query::GameDataDBQuery_type; }
     ~GameDataDBQuery() override {};
 
     bool get_as_bool() const override { return true; }
diff --git a/src/res.h b/src/res.h
index ba15c13..b36ce4f 100644
--- a/src/res.h
+++ b/src/res.h
@@ -17,11 +17,11 @@ class Result {
     static game_value cmd_waitForResult(game_state&, game_value_parameter right);
 
 	static void initCommands();
-	static inline sqf_script_type GameDataDBResult_type;
+	static inline sqf_script_type* GameDataDBResult_type;
 	static inline game_data_type GameDataDBResult_typeE;
-    static inline sqf_script_type GameDataDBAsyncResult_type;
+    static inline sqf_script_type* GameDataDBAsyncResult_type;
     static inline game_data_type GameDataDBAsyncResult_typeE;
-    static inline sqf_script_type GameDataDBNull_type;
+    static inline sqf_script_type* GameDataDBNull_type;
     static inline game_data_type GameDataDBNull_typeE;
 
 	static inline types::registered_sqf_function handle_cmd_affectedRows;
@@ -38,7 +38,7 @@ class GameDataDBResult : public game_data {
 public:
     GameDataDBResult() {}
     void lastRefDeleted() const override { delete this; }
-    const sqf_script_type& type() const override { return Result::GameDataDBResult_type; }
+    const sqf_script_type& type() const override { return *Result::GameDataDBResult_type; }
     ~GameDataDBResult() override {};
 
     bool get_as_bool() const override { return true; }
@@ -78,7 +78,7 @@ class GameDataDBAsyncResult : public game_data {
 public:
     GameDataDBAsyncResult() {}
     void lastRefDeleted() const override { delete this; }
-    const sqf_script_type& type() const override { return Result::GameDataDBAsyncResult_type; }
+    const sqf_script_type& type() const override { return *Result::GameDataDBAsyncResult_type; }
     ~GameDataDBAsyncResult() override {};
 
     bool get_as_bool() const override { return true; }
@@ -124,7 +124,7 @@ class GameDataDBNull : public game_data {
 public:
     GameDataDBNull() {}
     void lastRefDeleted() const override { delete this; }
-    const sqf_script_type& type() const override { return Result::GameDataDBNull_type; }
+    const sqf_script_type& type() const override { return *Result::GameDataDBNull_type; }
     ~GameDataDBNull() override {};
 
     bool get_as_bool() const override { return true; }
diff --git a/yaml-cpp b/yaml-cpp
index 5ac8a2c..0e6e28d 160000
--- a/yaml-cpp
+++ b/yaml-cpp
@@ -1 +1 @@
-Subproject commit 5ac8a2c996baec28f46a239e899908171f412ebd
+Subproject commit 0e6e28d1a38224fc8172fae0109ea7f673c096db