diff --git a/.gitignore b/.gitignore
index ef22635e..ecebf959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ MobileGLCodeManager.*
 MobileGLCodeManager
 .vscode
 .clangd
+MobileGL/MG_Test/build
diff --git a/MobileGL/MG_State/GLState/BufferState/BufferState.cpp b/MobileGL/MG_State/GLState/BufferState/BufferState.cpp
index 0dec2446..37e00502 100644
--- a/MobileGL/MG_State/GLState/BufferState/BufferState.cpp
+++ b/MobileGL/MG_State/GLState/BufferState/BufferState.cpp
@@ -36,6 +36,7 @@ namespace MobileGL {
 						return m_bindingSlots[i];
 					}
 				}
+				return m_bindingSlots[0]; // Fallback to the first slot if not found
 			}
 
 			void BufferState::MarkBufferObjectForDeletion(Uint index) {
diff --git a/MobileGL/MG_Test/CMakeLists.txt b/MobileGL/MG_Test/CMakeLists.txt
index 7291979e..33b86f29 100644
--- a/MobileGL/MG_Test/CMakeLists.txt
+++ b/MobileGL/MG_Test/CMakeLists.txt
@@ -8,6 +8,7 @@ include(FetchContent)
 FetchContent_Declare(
   googletest
   URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+  DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)