diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22a5eb3..bb41303 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,11 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 string(TIMESTAMP maj "%Y")
+math(EXPR maj ${maj})
 string(TIMESTAMP min "%m")
+math(EXPR min ${min})
 string(TIMESTAMP rev "%d")
+math(EXPR rev ${rev})
 
 project(DragonEngine VERSION ${maj}.${min}.${rev}.0)
 set(Dragon_FOUND CACHE BOOL "" ON)
diff --git a/modules/core b/modules/core
index 5682ea7..cf66885 160000
--- a/modules/core
+++ b/modules/core
@@ -1 +1 @@
-Subproject commit 5682ea78734720ad8f1d30fe8f4d2afb89153949
+Subproject commit cf66885a5f05fd0ab05e99c82d39909e042f7f84
diff --git a/modules/graphics b/modules/graphics
index 87ab397..2246980 160000
--- a/modules/graphics
+++ b/modules/graphics
@@ -1 +1 @@
-Subproject commit 87ab39715614aeb64fc13c925827872a42192d39
+Subproject commit 2246980e2484329784cedd9d2d9f695ffc4f090a