diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
deleted file mode 100644
index 881030502..000000000
--- a/cmake/FindSphinx.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2023 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#Look for an executable called sphinx-build
-find_program(
-    SPHINX_EXECUTABLE
-    NAMES sphinx-build
-    DOC "Path to sphinx-build executable"
-)
-
-include(FindPackageHandleStandardArgs)
-
-#Handle standard arguments to find_package like REQUIRED and QUIET
-find_package_handle_standard_args(
-    Sphinx
-    "Failed to find sphinx-build executable"
-    SPHINX_EXECUTABLE
-)
diff --git a/cmake/mkl.cmake b/cmake/mkl.cmake
index 1011dd596..13af27fc8 100644
--- a/cmake/mkl.cmake
+++ b/cmake/mkl.cmake
@@ -24,7 +24,7 @@ find_package(MKL CONFIG REQUIRED)
 #
 # The resulting object and linking are portable and should be suitable for distribution.
 if (SVS_EXPERIMENTAL_BUILD_CUSTOM_MKL)
-    set(SVS_MKL_CUSTOM_LIBRARY_NAME libmkl_custom)
+    set(SVS_MKL_CUSTOM_LIBRARY_NAME libsvs_mkl)
     set(SVS_MKL_CUSTOM_SO_NAME ${SVS_MKL_CUSTOM_LIBRARY_NAME}.so)
     set(SVS_MKL_CUSTOM_FULL_PATH ${CMAKE_CURRENT_BINARY_DIR}/${SVS_MKL_CUSTOM_SO_NAME})
 
@@ -82,7 +82,7 @@ if (SVS_EXPERIMENTAL_BUILD_CUSTOM_MKL)
     # Ensure that the custom Intel(R) MKL library is bundled with the rest of the library.
     include(GNUInstallDirs)
     install(IMPORTED_RUNTIME_ARTIFACTS svs_mkl LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-else()
+elseif(NOT SVS_EXPERIMENTAL_LINK_STATIC_MKL)
     target_compile_options(
         ${SVS_LIB} INTERFACE $<TARGET_PROPERTY:MKL::MKL,INTERFACE_COMPILE_OPTIONS>
     )