diff --git a/.gitignore b/.gitignore
index c19a8dec8..4954314f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ ecode.dmg
 /.ecode/.prjallowed
 /.cache/
 /compile_commands.json
+/bin/benchmarks*
 /bin/unit_tests/eepp*
 /bin/unit_tests/lib*
 /bin/unit_tests/output/*
diff --git a/include/eepp/ui/uinode.hpp b/include/eepp/ui/uinode.hpp
index 4dc904842..a0f8e4022 100644
--- a/include/eepp/ui/uinode.hpp
+++ b/include/eepp/ui/uinode.hpp
@@ -1783,7 +1783,7 @@ class EE_API UINode : public Node {
 	 * @param Flag The flag bit to modify.
 	 * @param Val The value to set (1 to set, 0 to clear).
 	 */
-	void writeFlag( const Uint32& Flag, const Uint32& Val );
+	void writeFlag( const Uint64& Flag, const Uint32& Val );
 
 	/**
 	 * @brief Creates padding rectangle from skin border size.
diff --git a/premake5.lua b/premake5.lua
index 5e9839ab5..25e8891fb 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1761,27 +1761,15 @@ workspace "eepp"
 		files { "src/benchmarks/*.cpp" }
 		incdirs { "src/thirdparty" }
 		build_link_configuration( "eepp-benchmarks", true )
-		if table.contains(backends, "SDL2") then
-			defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_2" }
-		end
-		if table.contains(backends, "SDL3") then
-			defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_3" }
-		end
-
+		
 	project "eepp-unit_tests"
 		kind "ConsoleApp"
 		targetdir(_MAIN_SCRIPT_DIR .. "/bin/unit_tests")
 		links { "eterm-static", "languages-syntax-highlighting-static" }
 		incdirs { "src/modules/eterm/include/", "src/thirdparty" }
 		language "C++"
-    files { "src/tests/unit_tests/*.cpp" }
-    build_link_configuration( "eepp-unit_tests", true )
-    if table.contains(backends, "SDL2") then
-        defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_2" }
-    end
-    if table.contains(backends, "SDL3") then
-        defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_3" }
-    end
+		files { "src/tests/unit_tests/*.cpp" }
+		build_link_configuration( "eepp-unit_tests", true )
 
 if os.isfile("external_projects.lua") then
 	dofile("external_projects.lua")
diff --git a/src/benchmarks/inline_layout_benchmark.cpp b/src/benchmarks/inline_layout_benchmark.cpp
index ad178f14e..44a994a37 100644
--- a/src/benchmarks/inline_layout_benchmark.cpp
+++ b/src/benchmarks/inline_layout_benchmark.cpp
@@ -81,5 +81,3 @@ UTEST( Benchmark, InlineLayout ) {
 
 	Engine::destroySingleton();
 }
-
-UTEST_MAIN()
diff --git a/src/benchmarks/main.cpp b/src/benchmarks/main.cpp
new file mode 100644
index 000000000..4b7b85cd5
--- /dev/null
+++ b/src/benchmarks/main.cpp
@@ -0,0 +1,3 @@
+#include "../tests/unit_tests/utest.h"
+
+UTEST_MAIN()
diff --git a/src/eepp/ui/uinode.cpp b/src/eepp/ui/uinode.cpp
index 37a65871a..58752cb23 100644
--- a/src/eepp/ui/uinode.cpp
+++ b/src/eepp/ui/uinode.cpp
@@ -1390,7 +1390,7 @@ UISkin* UINode::getSkin() const {
 	return NULL;
 }
 
-void UINode::writeFlag( const Uint32& Flag, const Uint32& Val ) {
+void UINode::writeFlag( const Uint64& Flag, const Uint32& Val ) {
 	if ( Val )
 		mFlags |= Flag;
 	else {