diff --git a/cmake/Packages/FindLuaBuild/LuaVanilla.cmake b/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
index b4c3c800..0c41761e 100644
--- a/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
+++ b/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
@@ -199,7 +199,7 @@ extern \"C\" {
 		file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP)
 	endif()
 
-	set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/include)
+	set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/src)
 endif()
 
 # # Target names
@@ -251,7 +251,9 @@ else()
 endif()
 target_compile_options(${liblua}
 	PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS})
+if(LUA_LOCAL_DIR)
 add_dependencies(${liblua} LUA_VANILLA)
+endif()
 target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
 if (UNIX)
 	target_link_libraries(${liblua} PRIVATE m)
diff --git a/tests/coroutines/source/array_proxy_lifetime.cpp b/tests/coroutines/source/array_proxy_lifetime.cpp
index 2e039f5d..320481ea 100644
--- a/tests/coroutines/source/array_proxy_lifetime.cpp
+++ b/tests/coroutines/source/array_proxy_lifetime.cpp
@@ -59,7 +59,7 @@ inline namespace sol2_regression_test_coroutines_array_proxy_lifetime {
 
 			value_type operator*() const {
 				size_t size = a.mpParent.children.size();
-				if (index >= 0 && index < size) {
+				if (index < size) {
 					return a.mpParent.children[index];
 				}
 				return std::weak_ptr<A>();