diff --git a/.gitmodules b/.gitmodules
index 61d5ca20..4f27da43 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,6 @@
-[submodule "lib/rain.metadata"]
-	path = lib/rain.metadata
-	url = https://github.com/rainprotocol/rain.metadata
 [submodule "lib/sol.lib.binmaskflag"]
 	path = lib/sol.lib.binmaskflag
 	url = https://github.com/rainprotocol/sol.lib.binmaskflag
-[submodule "lib/rain.math.fixedpoint"]
-	path = lib/rain.math.fixedpoint
-	url = https://github.com/rainprotocol/rain.math.fixedpoint
 [submodule "lib/rain.interpreter.interface"]
 	path = lib/rain.interpreter.interface
 	url = https://github.com/rainlanguage/rain.interpreter.interface
@@ -25,3 +19,9 @@
 [submodule "lib/rain.lib.memkv"]
 	path = lib/rain.lib.memkv
 	url = https://github.com/rainlanguage/rain.lib.memkv
+[submodule "lib/rain.math.fixedpoint"]
+	path = lib/rain.math.fixedpoint
+	url = https://github.com/rainlanguage/rain.math.fixedpoint
+[submodule "lib/rain.metadata"]
+	path = lib/rain.metadata
+	url = https://github.com/rainlanguage/rain.metadata
diff --git a/lib/rain.math.fixedpoint b/lib/rain.math.fixedpoint
index f0d74ed3..7d4d41f6 160000
--- a/lib/rain.math.fixedpoint
+++ b/lib/rain.math.fixedpoint
@@ -1 +1 @@
-Subproject commit f0d74ed3ef41f2a71fc43c99e81c3918b64e874b
+Subproject commit 7d4d41f6b779a4465993ef23b349203edf917f56
diff --git a/lib/rain.metadata b/lib/rain.metadata
index 9a018526..8d75b57c 160000
--- a/lib/rain.metadata
+++ b/lib/rain.metadata
@@ -1 +1 @@
-Subproject commit 9a0185267e6870035fd307de026eac8b77234057
+Subproject commit 8d75b57c575f9e426f4937a55e11447577d32495