diff --git a/MathNet.Numerics.All.sln b/MathNet.Numerics.All.sln
index ec7daa56..e8d2ac77 100644
--- a/MathNet.Numerics.All.sln
+++ b/MathNet.Numerics.All.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/src/NativeProviders/MKL/fft.cpp b/src/NativeProviders/MKL/fft.cpp
index 44dc474e..b4603d71 100644
--- a/src/NativeProviders/MKL/fft.cpp
+++ b/src/NativeProviders/MKL/fft.cpp
@@ -4,14 +4,13 @@
 #include <stdlib.h>
 #include <math.h>
 #include <float.h>
-#include "mkl_service.h"
 #include "mkl_dfti.h"
 
 template<typename Data, typename Precision, typename FFT>
 inline MKL_LONG fft_1d_inplace(const MKL_LONG n, Data x[], const Precision forward_scale, const Precision backward_scale, const DFTI_CONFIG_VALUE precision, const DFTI_CONFIG_VALUE domain, FFT fft)
 {
-	MKL_LONG status = 0;
-	DFTI_DESCRIPTOR_HANDLE descriptor = 0;
+	MKL_LONG status;
+	DFTI_DESCRIPTOR_HANDLE descriptor = nullptr;
 	status = DftiCreateDescriptor(&descriptor, precision, domain, 1, n);
 	if (0 != status) goto cleanup;
 
@@ -25,7 +24,6 @@ inline MKL_LONG fft_1d_inplace(const MKL_LONG n, Data x[], const Precision forwa
 	if (0 != status) goto cleanup;
 
 	status = fft(descriptor, x);
-	if (0 != status) goto cleanup;
 
 cleanup:
 	DftiFreeDescriptor(&descriptor);
diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters
index 336ae134..bf583e27 100644
--- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters
+++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters
@@ -33,7 +33,7 @@
     <ClCompile Include="..\..\Common\blas.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="fft.cpp">
+    <ClCompile Include="..\..\MKL\fft.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/src/Numerics/Providers/FourierTransform/ManagedFourierTransformProvider.cs b/src/Numerics/Providers/FourierTransform/ManagedFourierTransformProvider.cs
index 696f8f95..f20ece67 100644
--- a/src/Numerics/Providers/FourierTransform/ManagedFourierTransformProvider.cs
+++ b/src/Numerics/Providers/FourierTransform/ManagedFourierTransformProvider.cs
@@ -26,11 +26,15 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
-using System.Numerics;
 using MathNet.Numerics.IntegralTransforms;
 
 namespace MathNet.Numerics.Providers.FourierTransform
 {
+
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     public class ManagedFourierTransformProvider : IFourierTransformProvider
     {
         public virtual void InitializeVerify()
diff --git a/src/Numerics/Providers/FourierTransform/Mkl/MklFourierTransformProvider.cs b/src/Numerics/Providers/FourierTransform/Mkl/MklFourierTransformProvider.cs
index c3c66484..f1fa08c9 100644
--- a/src/Numerics/Providers/FourierTransform/Mkl/MklFourierTransformProvider.cs
+++ b/src/Numerics/Providers/FourierTransform/Mkl/MklFourierTransformProvider.cs
@@ -26,6 +26,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+#if NATIVE
+
 using System;
 using System.Numerics;
 
@@ -88,3 +90,5 @@ namespace MathNet.Numerics.Providers.FourierTransform.Mkl
         }
     }
 }
+
+#endif