diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index ad1631b..bd71193 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -39,7 +39,9 @@ jobs:
             python -m pip install pybind11[global]
 
           elif [ "$RUNNER_OS" == "macOS" ]; then
-              brew install cmake git ninja googletest glog fmt \
+              # Update or install cmake
+              brew upgrade cmake || brew install cmake
+              brew install git ninja googletest glog fmt \
                   jpeg-turbo libpng \
                   lz4 zstd xxhash \
                   boost \
diff --git a/cmake/LibrariesSetup.cmake b/cmake/LibrariesSetup.cmake
index 271a8cd..ff3f716 100644
--- a/cmake/LibrariesSetup.cmake
+++ b/cmake/LibrariesSetup.cmake
@@ -17,13 +17,15 @@ if (EXISTS "$ENV{HOME}/homebrew")
   list(APPEND CMAKE_FIND_ROOT_PATH "$ENV{HOME}/homebrew")
 endif()
 
-find_package(Boost REQUIRED
+find_package(Boost
   COMPONENTS
     filesystem
     chrono
     date_time
     system
     thread
+  CONFIG
+  REQUIRED
 )
 find_package(Eigen REQUIRED)
 find_package(FmtLib REQUIRED)
diff --git a/csrc/reader/Reader.cpp b/csrc/reader/Reader.cpp
index 3f9cd29..a3a28d3 100644
--- a/csrc/reader/Reader.cpp
+++ b/csrc/reader/Reader.cpp
@@ -18,7 +18,10 @@
 
 #include <vrs/os/Platform.h>
 #include <vrs/utils/AudioTrackExtractor.h>
+
+#if IS_VRS_FB_INTERNAL()
 #include <vrs/utils/cli/DataExtraction.h>
+#endif
 
 #include "AsyncVRSReader.h"
 #include "FilteredFileReader.h"
@@ -33,10 +36,12 @@ string extractAudioTrack(pyvrs::FilteredFileReader& filteredReader, const string
   return vrs::utils::extractAudioTrack(filteredReader.getFilteredReader(), wavFilePath);
 }
 
+#if IS_VRS_FB_INTERNAL()
 int extractAudio(const string& path, pyvrs::FilteredFileReader& filteredReader) {
   initVrsBindings();
   return vrs::utils::extractAudio(path, filteredReader.getFilteredReader());
 }
+#endif
 
 void pybind_reader(py::module& m) {
   py::enum_<pyvrs::ImageConversion>(m, "ImageConversion")
@@ -54,13 +59,12 @@ void pybind_reader(py::module& m) {
 
 #if IS_VRS_FB_INTERNAL()
   pybind_filtered_filereader(m);
+  m.def("extract_audio", &extractAudio, "Extract all audio tracks from given FilteredFileReader");
 #endif
 
   m.def(
       "extract_audio_track",
       &extractAudioTrack,
       "Extract audio track from given FilteredFileReader");
-
-  m.def("extract_audio", &extractAudio, "Extract all audio tracks from given FilteredFileReader");
 }
 } // namespace pyvrs