diff --git a/FindNanopb.cmake b/FindNanopb.cmake
index d036384..2125dad 100644
--- a/FindNanopb.cmake
+++ b/FindNanopb.cmake
@@ -2,7 +2,7 @@ include("GenericFindDependency")
 option(nanopb_BUILD_GENERATOR "" OFF)
 GenericFindDependency(
   TARGET protobuf-nanopb
-  SOURCE_DIR "third_party/nanopb"
+  SOURCE_DIR "nanopb"
   SYSTEM_INCLUDES
-  )
+)
 
diff --git a/FindStarling.cmake b/FindStarling.cmake
index 9b07e99..a8649fb 100644
--- a/FindStarling.cmake
+++ b/FindStarling.cmake
@@ -7,10 +7,16 @@ option(starling_ENABLE_EXAMPLES "" OFF)
 GenericFindDependency(
   TARGET pvt-runner-lib
   ADDITIONAL_TARGETS
+    math_routines
     sensorfusion
     pvt_driver
-    pvt-engine
     pvt-common
+    pvt-engine
+    pvt-runner
+    pvt-sbp-logging
+    pvt-sizes
+    pvt-version
+    starling-build-config
     starling-util
   SOURCE_DIR starling
   SYSTEM_HEADER_FILE "pvt_driver/runner/pvt_runner.h"
diff --git a/GenericFindDependency.cmake b/GenericFindDependency.cmake
index f03f2f2..7361aba 100644
--- a/GenericFindDependency.cmake
+++ b/GenericFindDependency.cmake
@@ -254,9 +254,7 @@ macro(create_source_search_paths)
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${x_TARGET}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/lib${x_TARGET}")
   else()
-    list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_SOURCE_DIR}")
-    list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_TARGET}/${x_SOURCE_DIR}")
@@ -392,7 +390,9 @@ function(GenericFindDependency)
   # If the primary target exposes additional targets, mark them as system
   # targets in accordance to how the primary target was marked
   foreach(additional_target IN LISTS x_ADDITIONAL_TARGETS)
-    mark_target_as_system_includes(${additional_target})
+    if(TARGET ${additional_target})
+      mark_target_as_system_includes(${additional_target})
+    endif()
   endforeach()
 endfunction()