diff --git a/.gitmodules b/.gitmodules
index 36536c4..9d8134b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,12 @@
 [submodule "ggtracker"]
 	path = ggtracker
 	url = git@github.com:dsjoerg/ggtracker.git
+	branch = master
 [submodule "esdb"]
 	path = esdb
 	url = git@github.com:dsjoerg/esdb.git
+	branch = master
 [submodule "sc2reader"]
 	path = sc2reader
 	url = git@github.com:ggtracker/sc2reader.git
-    branch = upstream
+	branch = upstream
diff --git a/esdb b/esdb
index 4f53452..e13be8e 160000
--- a/esdb
+++ b/esdb
@@ -1 +1 @@
-Subproject commit 4f534525ba2abade1311f420a59815504cef54fc
+Subproject commit e13be8e3d344460d7cae486a0c5e4794b5fba296
diff --git a/ggtracker b/ggtracker
index 38debcb..582b7d9 160000
--- a/ggtracker
+++ b/ggtracker
@@ -1 +1 @@
-Subproject commit 38debcb98c5d21762bd23a3206b72da58eadddea
+Subproject commit 582b7d91ffa398aa31771be6668a2f468ff6b1e2
diff --git a/sc2reader b/sc2reader
index 504fff2..80ea580 160000
--- a/sc2reader
+++ b/sc2reader
@@ -1 +1 @@
-Subproject commit 504fff2ed926c206b9aa74c70bbc017bb7c40718
+Subproject commit 80ea58043a9375aff8719b26b70ec154f569d7a3