diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3a1f484..60c2985d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,9 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
     set(CMAKE_BUILD_TYPE "Debug")
 endif()
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    set(CMAKE_C_FLAGS "-pedantic -Wall -Wextra -g -O2")
+    set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -g -O2")
 elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    set(CMAKE_C_FLAGS "-pedantic -Wall -Wextra -g -O0")
+    set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -g -O0")
 endif()
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} OD_VERSION_BUILD)
diff --git a/lib/machinarium b/lib/machinarium
index cc6518f8..2e9593d8 160000
--- a/lib/machinarium
+++ b/lib/machinarium
@@ -1 +1 @@
-Subproject commit cc6518f8e811190845d6b0c646cf2477ca3414b4
+Subproject commit 2e9593d8a5915e02f2027cd019fe4ec734c7ae95
diff --git a/lib/soprano b/lib/soprano
index 52756c67..b2976adc 160000
--- a/lib/soprano
+++ b/lib/soprano
@@ -1 +1 @@
-Subproject commit 52756c677ef7db7d2c8cbc46ecabdf96e5e5bd86
+Subproject commit b2976adcdea7e8bd81b73747be8f06937de95c67