diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2676c464..b7394b42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.16)
 project(Spix LANGUAGES CXX)
 
 option(SPIX_BUILD_EXAMPLES "Build Spix examples." ON)
diff --git a/libs/Core/src/Commands/WaitForItem.cpp b/libs/Core/src/Commands/WaitForItem.cpp
index acae3bc0..7321faa6 100644
--- a/libs/Core/src/Commands/WaitForItem.cpp
+++ b/libs/Core/src/Commands/WaitForItem.cpp
@@ -12,12 +12,12 @@ namespace cmd {
 
 WaitForItem::WaitForItem(ItemPath path, std::chrono::milliseconds maxWaitTime, std::promise<bool> promise)
 : m_path(std::move(path))
-, m_promise(std::move(promise))
 , m_maxWaitTime(std::move(maxWaitTime))
+, m_promise(std::move(promise))
 {
 }
 
-void WaitForItem::execute(CommandEnvironment& env)
+void WaitForItem::execute(CommandEnvironment& /*env*/)
 {
     m_promise.set_value(m_itemFound);
 }
diff --git a/libs/Core/src/Commands/WaitForItem.h b/libs/Core/src/Commands/WaitForItem.h
index 38fff0ed..e84f9698 100644
--- a/libs/Core/src/Commands/WaitForItem.h
+++ b/libs/Core/src/Commands/WaitForItem.h
@@ -25,8 +25,8 @@ class WaitForItem : public Command {
 private:
     bool m_timerInitialized = false;
     std::chrono::steady_clock::time_point m_startTime;
-    std::chrono::milliseconds m_maxWaitTime;
     ItemPath m_path;
+    std::chrono::milliseconds m_maxWaitTime;
     std::promise<bool> m_promise;
     bool m_itemFound = false;
 };
diff --git a/libs/Core/src/Scene/Mock/MockEvents.cpp b/libs/Core/src/Scene/Mock/MockEvents.cpp
index d8334424..981c98f5 100644
--- a/libs/Core/src/Scene/Mock/MockEvents.cpp
+++ b/libs/Core/src/Scene/Mock/MockEvents.cpp
@@ -36,11 +36,11 @@ void MockEvents::stringInput(Item* item, const std::string& text)
     }
 }
 
-void MockEvents::keyPress(Item* item, int keyCode, KeyModifier mod)
+void MockEvents::keyPress(Item* /*item*/, int /*keyCode*/, KeyModifier /*mod*/)
 {
 }
 
-void MockEvents::keyRelease(Item* item, int keyCode, KeyModifier mod)
+void MockEvents::keyRelease(Item* /*item*/, int /*keyCode*/, KeyModifier /*mod*/)
 {
 }
 
diff --git a/libs/Core/src/Scene/Mock/MockItem.cpp b/libs/Core/src/Scene/Mock/MockItem.cpp
index 1267a57d..f7215cf7 100644
--- a/libs/Core/src/Scene/Mock/MockItem.cpp
+++ b/libs/Core/src/Scene/Mock/MockItem.cpp
@@ -36,11 +36,11 @@ std::string MockItem::stringProperty(const std::string& name) const
     return m_stringProperties.at(name);
 }
 
-void MockItem::setStringProperty(const std::string& name, const std::string& value)
+void MockItem::setStringProperty(const std::string& /*name*/, const std::string& /*value*/)
 {
 }
 
-bool MockItem::invokeMethod(const std::string& method, const std::vector<Variant>& args, Variant& ret)
+bool MockItem::invokeMethod(const std::string& /*method*/, const std::vector<Variant>& /*args*/, Variant& ret)
 {
     ret = Variant(nullptr);
     return true;
diff --git a/libs/Scenes/QtQuick/CMakeLists.txt b/libs/Scenes/QtQuick/CMakeLists.txt
index dfc4f9f5..60216245 100644
--- a/libs/Scenes/QtQuick/CMakeLists.txt
+++ b/libs/Scenes/QtQuick/CMakeLists.txt
@@ -47,7 +47,7 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX source FILES ${SOURCES})
 #
 # Qt MOC Files
 #
-cmake_language(CALL "qt${SPIX_QT_MAJOR}_wrap_cpp" MOC_FILES "include/Spix/QtQmlBot.h")
+qt_wrap_cpp(SOURCES "include/Spix/QtQmlBot.h")
 
 #
 # Target
diff --git a/libs/Scenes/QtQuick/src/QtItemTools.cpp b/libs/Scenes/QtQuick/src/QtItemTools.cpp
index d2fedc21..f5703c3d 100644
--- a/libs/Scenes/QtQuick/src/QtItemTools.cpp
+++ b/libs/Scenes/QtQuick/src/QtItemTools.cpp
@@ -263,9 +263,9 @@ Variant QMLReturnVariantToVariant(const QMLReturnVariant& var)
 
 bool CanConvertArgTypes(const QMetaMethod& metaMethod, const std::vector<QVariant>& varargs)
 {
-    if (metaMethod.parameterCount() != varargs.size())
+    if (metaMethod.parameterCount() != static_cast<int>(varargs.size()))
         return false;
-    for (size_t i = 0; i < metaMethod.parameterCount(); i++) {
+    for (size_t i = 0; i < static_cast<size_t>(metaMethod.parameterCount()); i++) {
         int targetType = metaMethod.parameterType(i);
         if (targetType != QMetaType::Type::QVariant && !varargs[i].canConvert(targetType))
             return false;
@@ -277,7 +277,7 @@ bool GetMethodMetaForArgs(
     const QObject& obj, const std::string& method, const std::vector<QVariant>& varargs, QMetaMethod& ret)
 {
     const QMetaObject* itemMeta = obj.metaObject();
-    for (size_t i = 0; i < itemMeta->methodCount(); i++) {
+    for (size_t i = 0; i < static_cast<size_t>(itemMeta->methodCount()); i++) {
         const QMetaMethod methodMeta = itemMeta->method(i);
         if (methodMeta.name().compare(method.data()) == 0 && CanConvertArgTypes(methodMeta, varargs)) {
             ret = methodMeta;