diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 105b9604..be952376 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(./entt)
 add_subdirectory(./json)
 
 add_subdirectory(./solanaceae_util)
+add_subdirectory(./solanaceae_object_store)
 add_subdirectory(./solanaceae_contact)
 add_subdirectory(./solanaceae_message3)
 add_subdirectory(./solanaceae_message_serializer)
@@ -15,8 +16,6 @@ add_subdirectory(./toxcore)
 add_subdirectory(./solanaceae_toxcore)
 add_subdirectory(./solanaceae_tox)
 
-add_subdirectory(./solanaceae_object_store)
-
 add_subdirectory(./sdl)
 add_subdirectory(./imgui)
 
diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
index f03c4b12..f1dd5107 160000
--- a/external/solanaceae_message3
+++ b/external/solanaceae_message3
@@ -1 +1 @@
-Subproject commit f03c4b12109489b0636d4ac84b457c9b7c59a5b3
+Subproject commit f1dd5107f820fe86cb6b6b9ca22d42e0a3a3cf30
diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store
index c2bf065a..4605d64d 160000
--- a/external/solanaceae_object_store
+++ b/external/solanaceae_object_store
@@ -1 +1 @@
-Subproject commit c2bf065a0a1d9564ed6331441cc96cfbc956ba7d
+Subproject commit 4605d64df28c45096cef7748d5c143e942aefeb1