diff --git a/prepare.py b/prepare.py
index 8bc775fc9..6c17a8ad4 100755
--- a/prepare.py
+++ b/prepare.py
@@ -498,7 +498,7 @@ def main(argv=None):
     argparser.add_argument(
         '-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true')
     argparser.add_argument(
-        '--disable-gpl-third-parties', help="Disable GPL third parties such as FFMpeg, x264.", action='store_false')
+        '--disable-gpl-third-parties', help="Disable GPL third parties such as FFMpeg, x264.", action='store_true')
     argparser.add_argument(
         '--enable-non-free-codecs', help="Enable non-free codecs such as OpenH264, MPEG4, etc.. Final application must comply with their respective license (see README.md).", action='store_true')
     argparser.add_argument(
@@ -525,9 +525,12 @@ def main(argv=None):
     if check_tools() != 0:
         return 1
 
-    additional_args += ["-DENABLE_DEBUG_LOGS={}".format("YES" if args.debug_verbose else "NO")]
-    additional_args += ["-DENABLE_NON_FREE_CODECS={}".format("YES" if args.enable_non_free_codecs else "NO")]
-    additional_args += ["-DENABLE_GPL_THIRD_PARTIES={}".format("NO" if args.disable_gpl_third_parties else "YES")]
+    if args.debug_verbose is True:
+        additional_args += ["-DENABLE_DEBUG_LOGS=YES"]
+    if args.enable_non_free_codecs is True:
+        additional_args += ["-DENABLE_NON_FREE_CODECS=YES"]
+    if args.disable_gpl_third_parties is True:
+        additional_args += ["-DENABLE_GPL_THIRD_PARTIES=NO"]
 
     if args.tunnel or os.path.isdir("submodules/tunnel"):
         if not os.path.isdir("submodules/tunnel"):
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index e7195fe05..93910b557 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit e7195fe050bd4191f2c389170d8851260ba47f8d
+Subproject commit 93910b55774ca708cc6c16c41c6a705630176ae1
diff --git a/submodules/msx264 b/submodules/msx264
index 2abff2362..e8fd6adb5 160000
--- a/submodules/msx264
+++ b/submodules/msx264
@@ -1 +1 @@
-Subproject commit 2abff23629257c3f6f46b8d7b3a483efd0eb4342
+Subproject commit e8fd6adb59e9015c1bfe58e364565016ef26122c