diff --git a/include/modules/meta/base.inl b/include/modules/meta/base.inl
index d8cd4b29..cf5fc3c2 100644
--- a/include/modules/meta/base.inl
+++ b/include/modules/meta/base.inl
@@ -124,7 +124,7 @@ namespace modules {
     int i{0};
     bool prevtag{true};
 
-    auto mingap = std::max(1UL, format->spacing);
+    auto mingap = std::max(1_z, format->spacing);
 
     size_t start, end;
     string value{format->value};
diff --git a/include/settings.hpp.cmake b/include/settings.hpp.cmake
index 65a38cfb..3bafe586 100644
--- a/include/settings.hpp.cmake
+++ b/include/settings.hpp.cmake
@@ -31,7 +31,7 @@
 #cmakedefine VERBOSE_TRACELOG
 #cmakedefine DEBUG_HINTS
 
-static const size_t EVENT_SIZE{64UL};
+static const size_t EVENT_SIZE = 64;
 
 static const int SIGN_PRIORITY_CONTROLLER{1};
 static const int SIGN_PRIORITY_SCREEN{2};
diff --git a/src/modules/xkeyboard.cpp b/src/modules/xkeyboard.cpp
index 1c788e9c..26770d6b 100644
--- a/src/modules/xkeyboard.cpp
+++ b/src/modules/xkeyboard.cpp
@@ -124,7 +124,7 @@ namespace modules {
       return false;
     }
 
-    size_t current_group{m_keyboard->current() + 1UL};
+    size_t current_group = m_keyboard->current() + 1;
 
     if (current_group >= m_keyboard->size()) {
       current_group = 0;