diff --git a/CMakeLists.txt b/CMakeLists.txt
index 729007a87..d7c443dd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,10 +67,8 @@ option(GTSAM_THROW_CHEIRALITY_EXCEPTION "Throw exception when a triangulated poi
 # TODO: Check for matlab mex binary before handling building of binaries
 option(GTSAM_INSTALL_MATLAB_TOOLBOX      "Enable/Disable installation of matlab toolbox"  OFF)
 option(GTSAM_BUILD_WRAP                  "Enable/Disable building of matlab wrap utility (necessary for matlab interface)" ON)
-option(GTSAM_INSTALL_WRAP                "Enable/Disable installation of wrap utility for wrapping other libraries"    ON)
 
 # Check / set dependent variables for MATLAB wrapper
-set(GTSAM_WRAP_HEADER_PATH "${PROJECT_SOURCE_DIR}/wrap")
 if(GTSAM_INSTALL_MATLAB_TOOLBOX AND NOT GTSAM_BUILD_WRAP)
 	message(FATAL_ERROR "GTSAM_INSTALL_MATLAB_TOOLBOX is enabled, please also enable GTSAM_BUILD_WRAP")
 endif()
diff --git a/gtsam_extra.cmake.in b/gtsam_extra.cmake.in
index 4eccddfb3..89a97d51b 100644
--- a/gtsam_extra.cmake.in
+++ b/gtsam_extra.cmake.in
@@ -10,9 +10,9 @@ set (GTSAM_USE_TBB @GTSAM_USE_TBB@)
 set (GTSAM_DEFAULT_ALLOCATOR @GTSAM_DEFAULT_ALLOCATOR@)
 
 if("@GTSAM_USE_TBB@")
-  list(INSERT GTSAM_INCLUDE_DIR 0 "@TBB_INCLUDE_DIRS@") # Insert at beginning of list so that GTSAM still comes last
+  list(APPEND GTSAM_INCLUDE_DIR "@TBB_INCLUDE_DIRS@")
 endif()
 
 if("@GTSAM_USE_EIGEN_MKL@")
-  list(INSERT GTSAM_INCLUDE_DIR 0 "@MKL_INCLUDE_DIR@") # Insert at beginning of list so that GTSAM still comes last
+  list(APPEND GTSAM_INCLUDE_DIR "@MKL_INCLUDE_DIR@")
 endif()
diff --git a/wrap/CMakeLists.txt b/wrap/CMakeLists.txt
index ed0234bfe..28f8bea48 100644
--- a/wrap/CMakeLists.txt
+++ b/wrap/CMakeLists.txt
@@ -23,11 +23,9 @@ file(RELATIVE_PATH relative_path "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE
 set_target_properties(wrap_lib wrap PROPERTIES FOLDER "${relative_path}")
 
 # Install wrap binary and export target
-if (GTSAM_INSTALL_WRAP)
-    install(TARGETS wrap EXPORT GTSAM-exports DESTINATION bin)
-    list(APPEND GTSAM_EXPORTED_TARGETS wrap)
-    set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE)
-endif(GTSAM_INSTALL_WRAP)
+install(TARGETS wrap EXPORT GTSAM-exports DESTINATION bin)
+list(APPEND GTSAM_EXPORTED_TARGETS wrap)
+set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE)
 
 # Install matlab header
 install(FILES matlab.h DESTINATION include/wrap)