diff --git a/src/condor_gridmanager/slurm_status.py b/src/condor_gridmanager/slurm_status.py
index 8e0dd6cf1f..bb8b08692e 100755
--- a/src/condor_gridmanager/slurm_status.py
+++ b/src/condor_gridmanager/slurm_status.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 #  File:     slurm_status.py
 #
diff --git a/src/condor_job_router/condor_router_history b/src/condor_job_router/condor_router_history
index f992237a34..fad8aad8ed 100755
--- a/src/condor_job_router/condor_router_history
+++ b/src/condor_job_router/condor_router_history
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 ##**************************************************************
 ##
 ## Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
diff --git a/build/cmake/CondorConfigure.cmake b/build/cmake/CondorConfigure.cmake
index 948b45d861..dbbec26777 100644
--- a/build/cmake/CondorConfigure.cmake
+++ b/build/cmake/CondorConfigure.cmake
@@ -82,7 +82,7 @@ message(STATUS "********* BEGINNING CONFIGURATION *********")
 
 # To find python in Windows we will use alternate technique
 if(NOT WINDOWS AND NOT CONDOR_PLATFORM MATCHES "Fedora19")
-	include (FindPythonInterp)
+	include (FindPython2)
 	# As of cmake 2.8.8, the variable below is defined by FindPythonLibs.
 	# This helps ensure we get the same version of the libraries and python
 	# on systems with both python2 and python3.
diff --git a/externals/bundles/boost/1.64.0/CMakeLists.txt b/externals/bundles/boost/1.64.0/CMakeLists.txt
index 0d298808fb..61e8e88670 100644
--- a/externals/bundles/boost/1.64.0/CMakeLists.txt
+++ b/externals/bundles/boost/1.64.0/CMakeLists.txt
@@ -29,7 +29,7 @@ if (NOT WINDOWS)
 	  set (BOOST_COMPONENTS unit_test_framework ${BOOST_COMPONENTS})
 	endif()
         if (WITH_PYTHON_BINDINGS)
-          set (BOOST_COMPONENTS python ${BOOST_COMPONENTS})
+          set (BOOST_COMPONENTS python27 ${BOOST_COMPONENTS})
         endif()
 
     endif()