diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 0041aaf7..ac56523f 100755
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -2,9 +2,14 @@ cmake_minimum_required (VERSION 3.6)
 cmake_policy(SET CMP0077 NEW)
 project(CMSISDSP)
 
+# DSP Sources
+SET(DSP ${ROOT}/CMSIS/DSP)
+
+list(APPEND CMAKE_MODULE_PATH ${DSP}/Source)
+list(APPEND CMAKE_MODULE_PATH ${DSP})
+
+
 include(config)
-# Needed to find the config modules
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 
 option(NEON "Neon acceleration" OFF)
@@ -141,10 +146,7 @@ option(DCT4_Q15_8192         "dct4 q15 8192"                    OFF)
 #
 ###########################
 
-# DSP Sources
-SET(DSP ${ROOT}/CMSIS/DSP)
 
-list(APPEND CMAKE_MODULE_PATH ${DSP}/Source)
 
 add_library(CMSISDSP INTERFACE)
 
diff --git a/Source/TransformFunctions/CMakeLists.txt b/Source/TransformFunctions/CMakeLists.txt
index 02f40c8c..194f6072 100644
--- a/Source/TransformFunctions/CMakeLists.txt
+++ b/Source/TransformFunctions/CMakeLists.txt
@@ -110,6 +110,10 @@ target_sources(CMSISDSPTransform PRIVATE arm_cfft_q31.c)
 target_sources(CMSISDSPTransform PRIVATE arm_cfft_radix4_q31.c)
 endif()
 
+# For scipy or or wrappers
+if (WRAPPER)
+target_sources(CMSISDSPTransform PRIVATE arm_cfft_radix2_init_f32.c)
+endif()
 
 ### Includes
 target_include_directories(CMSISDSPTransform PUBLIC "${DSP}/Include")
diff --git a/Toolchain/Tools.cmake b/Toolchain/Tools.cmake
index 8097219d..2b3163e3 100644
--- a/Toolchain/Tools.cmake
+++ b/Toolchain/Tools.cmake
@@ -5,4 +5,9 @@ endif()
 
 if (GCC)
     include(Toolchain/GCC)
+endif()
+
+if (MSVC)
+    function(compilerSpecificCompileOptions PROJECTNAME ROOT)
+    endfunction()
 endif()
\ No newline at end of file