diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80492950d..b582d21e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -673,7 +673,7 @@ if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
         if(POLICY CMP0057)
             cmake_policy(SET CMP0057 NEW)
         endif()
-        if(NOT ENABLE_UNIT_TESTING_EXTRA) # Workaround for GPSTk
+        if((NOT ENABLE_UNIT_TESTING_EXTRA) AND (NOT ENABLE_SYSTEM_TESTING_EXTRA) AND (NOT ENABLE_FPGA)) # Workaround for GPSTk
             find_package(FILESYSTEM COMPONENTS Final Experimental)
             set_package_properties(FILESYSTEM PROPERTIES
                 URL "https://en.cppreference.com/w/cpp/filesystem"
diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake
index 6c8e52f8f..f6f806817 100644
--- a/cmake/Modules/FindPCAP.cmake
+++ b/cmake/Modules/FindPCAP.cmake
@@ -92,13 +92,13 @@ set(PCAP_LIBRARIES ${PCAP_LIBRARY})
 if(PCAP_INCLUDE_DIRS)
   message(STATUS "Pcap include dirs set to ${PCAP_INCLUDE_DIRS}")
 else()
-  message(FATAL " Pcap include dirs cannot be found")
+  message(STATUS "Pcap include dirs cannot be found.")
 endif()
 
 if(PCAP_LIBRARIES)
   message(STATUS "Pcap library set to ${PCAP_LIBRARIES}")
 else()
-  message(FATAL "Pcap library cannot be found")
+  message(STATUS "Pcap library cannot be found.")
 endif()
 
 #Functions