diff --git a/CMake/FindNumpy.cmake b/CMake/FindNumpy.cmake
index acf70ebad9..4170adb613 100644
--- a/CMake/FindNumpy.cmake
+++ b/CMake/FindNumpy.cmake
@@ -1,32 +1,29 @@
 #  Variables set by this script
 #  NUMPY_FOUND
 #  NUMPY_INCLUDE_DIR
 
 find_package(PackageHandleStandardArgs)
 
 # numpy dir defined, own numpy deployed in python runtime
 if(DEFINED Numpy_DIR AND EXISTS ${Numpy_DIR})
   if(EXISTS ${Numpy_DIR}/core/include)
     set(NUMPY_INCLUDE_DIR  ${Numpy_DIR}/core/include)
-    MESSAGE("NUMPY: " ${NUMPY_INCLUDE_DIR})
   endif()
 else() #numpy dir not defined
   execute_process (
      COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
      OUTPUT_VARIABLE output
      OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
   if(DEFINED output AND EXISTS ${output} )
     set (NUMPY_INCLUDE_DIR ${output})
   endif()
 endif()
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Numpy DEFAULT_MSG NUMPY_INCLUDE_DIR)
 
-MESSAGE("found: " ${NUMPY_FOUND})
-
 MARK_AS_ADVANCED (
   NUMPY_INCLUDE_DIR
 )
 
diff --git a/CMake/PackageDepends/MITK_Numpy_Config.cmake b/CMake/PackageDepends/MITK_Numpy_Config.cmake
index f48be0e8c0..d10c0eaa78 100644
--- a/CMake/PackageDepends/MITK_Numpy_Config.cmake
+++ b/CMake/PackageDepends/MITK_Numpy_Config.cmake
@@ -1,5 +1,4 @@
 if(MITK_USE_Python)
-   find_package(Numpy REQUIRED)
-   MESSAGE("NUMPY2: " ${NUMPY_INCLUDE_DIR})
-   list(APPEND ALL_INCLUDE_DIRECTORIES ${NUMPY_INCLUDE_DIR})
+  find_package(Numpy REQUIRED)
+  list(APPEND ALL_INCLUDE_DIRECTORIES ${NUMPY_INCLUDE_DIR})
 endif()
diff --git a/CMakeExternals/PatchSimpleITK.cmake b/CMakeExternals/PatchSimpleITK.cmake
index 50ac0ce40b..185fad393d 100644
--- a/CMakeExternals/PatchSimpleITK.cmake
+++ b/CMakeExternals/PatchSimpleITK.cmake
@@ -1,9 +1,18 @@
 # Called by ITK.cmake (ExternalProject_Add) as a patch for ITK to work with external GDCM 2.2.1
 # and remove all itk video libs to resolve external windows linker errors with opencv
 
 set(path "CMakeLists.txt")
 file(STRINGS ${path} contents NEWLINE_CONSUME)
 string(REPLACE "ITK_LIBRARY_DIRS}\")" "ITK_LIBRARY_DIRS}\" \"\${GDCM_DIR}/bin\")
                list(REMOVE_ITEM ITK_LIBRARIES ITKVideoBridgeOpenCV ITKVideoCore ITKVideoIO)" contents ${contents})
 set(CONTENTS ${contents})
 configure_file(${TEMPLATE_FILE} ${path} @ONLY)
+
+# fix for double import targets
+set(path "SimpleITKConfig.cmake.in")
+file(STRINGS ${path} contents NEWLINE_CONSUME)
+string(REPLACE "if(NOT ITK_TARGETS_IMPORTED)" "if(NOT TARGET ITKCommon)" contents ${contents})
+set(CONTENTS ${contents})
+string(REPLACE "if(NOT SimpleITK_TARGETS_IMPORTED)" "if(NOT TARGET SimpleITKCommon)" contents ${contents})
+set(CONTENTS ${contents})
+configure_file(${TEMPLATE_FILE} ${path} @ONLY)