diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ecdf54c..f31fb24a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,12 @@ IF(NOT GIT_SUBMOD_RESULT EQUAL "0")
     message(FATAL_ERROR "${GIT_COMMAND_EXECUTED} failed with ${GIT_SUBMOD_RESULT}, please checkout submodules.")
 ENDIF()
 
+IF(DEFINED CMAKE_TOOLCHAIN_FILE)
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE})
+ELSE()
 set(CMAKE_TOOLCHAIN_FILE "vcpkg/scripts/buildsystems/vcpkg.cmake")
+ENDIF()
+
 
 project(pybnesian VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES CXX)
 ADD_DEFINITIONS("-DVERSION_INFO=${SKBUILD_PROJECT_VERSION}")
@@ -66,10 +71,10 @@ ELSEIF(UNIX)
     SET(SCRIPT_EXTENSION "sh")
 ENDIF()
 
-execute_process(COMMAND python expand_sources.py RESULT_VARIABLE EXPAND_SOURCES_RESULT)
+execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/expand_sources.py RESULT_VARIABLE EXPAND_SOURCES_RESULT)
 
 IF(NOT EXPAND_SOURCES_RESULT EQUAL "0")
-    message(FATAL_ERROR "$python expand_sources.py failed with ${EXPAND_SOURCES_RESULT}")
+    message(FATAL_ERROR "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/expand_sources.py failed with ${EXPAND_SOURCES_RESULT}")
 ENDIF()
 
 execute_process(COMMAND ${SCRIPT_PREFIX}bootstrap-vcpkg.${SCRIPT_EXTENSION} WORKING_DIRECTORY "vcpkg" RESULT_VARIABLE VCPKG_BOOTSTRAP_RESULT)