diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml
index 2e46933911..a0e1733c55 100644
--- a/.github/workflows/full-build.yml
+++ b/.github/workflows/full-build.yml
@@ -339,7 +339,6 @@ jobs:
             -DPython_EXECUTABLE:FILEPATH="$SYSTEM_PYTHON_PATH" \
             -DPYTHON_VERSION:STRING=${{ env.PYTHON_REQUIRED_VERSION }} \
             -DSYSTEM_RUBY_EXECUTABLE="$SYSTEM_RUBY_PATH" \
-            -DCMAKE_INSTALL_RPATH='$ORIGIN;$ORIGIN/../lib' \
             -DCMAKE_JOB_POOL_LINK:STRING=console \
             "$GITHUB_WORKSPACE"
 
@@ -856,7 +855,6 @@ jobs:
           -DCPACK_BINARY_IFW:BOOL=ON \
           -DBUILD_PYTHON_BINDINGS:BOOL=ON \
           -DBUILD_PYTHON_PIP_PACKAGE:BOOL=OFF \
-          -DCMAKE_INSTALL_RPATH="@loader_path;@executable_path;@loader_path/../lib" \
           -DPYTHON_VERSION:STRING=${{ env.PYTHON_REQUIRED_VERSION }} \
           -DPython_ROOT_DIR:PATH="$(dirname $(dirname $SYSTEM_PYTHON_PATH))" \
           -DCMAKE_JOB_POOL_LINK:STRING=console \
diff --git a/Jenkinsfile_develop_osx b/Jenkinsfile_develop_osx
index d7d18e8711..4f6e7a0bfb 100644
--- a/Jenkinsfile_develop_osx
+++ b/Jenkinsfile_develop_osx
@@ -1,6 +1,6 @@
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
 
-@Library('cbci_shared_libs') _
+@Library('cbci_shared_libs@boost_compatibility') _
 
 // Build for PR to develop branch only.
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) {
diff --git a/src/modelica/CMakeLists.txt b/src/modelica/CMakeLists.txt
index 110ac828ba..89e002bcad 100644
--- a/src/modelica/CMakeLists.txt
+++ b/src/modelica/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(openstudio_modelica_depends
   antlr4_static
+  ${openstudio_utilities_depends}
 )
 set(openstudio_modelica_depends ${openstudio_modelica_depends} PARENT_SCOPE)
 
@@ -28,7 +29,6 @@ add_library(openstudio_modelica
 target_link_libraries(openstudio_modelica 
   PUBLIC 
   ${openstudio_modelica_depends}
-  openstudio_utilities
 )
 
 target_compile_definitions(openstudio_modelica
@@ -44,18 +44,6 @@ set(openstudio_modelica_swig_src
 #macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_SWIG_TARGETS)
 MAKE_SWIG_TARGET(OpenStudioModelica modelica "${CMAKE_CURRENT_SOURCE_DIR}/Modelica.i" "${openstudio_modelica_swig_src}" openstudio_modelica OpenStudioUtilities)
 
-if(TARGET ruby_OpenStudioModelica)
-  target_link_libraries(ruby_OpenStudioModelica openstudiolib)
-endif()
-
-if(TARGET python_OpenStudioModelica)
-  target_link_libraries(python_OpenStudioModelica PUBLIC openstudiolib)
-endif()
-
-if(TARGET python_package_OpenStudioModelica)
-  target_link_libraries(python_package_OpenStudioModelica PUBLIC openstudiolib)
-endif()
-
 add_executable(antdemo
   main.cpp
 )