diff --git a/lib/simd/Intel512double.h b/lib/simd/Intel512double.h
index a2e9d38f..2b2b9099 100644
--- a/lib/simd/Intel512double.h
+++ b/lib/simd/Intel512double.h
@@ -109,12 +109,12 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 #undef VMOVIDUP
 #undef VMOVRDUP
-#undef VMADDSBUB
+#undef VMADDSUB
 #undef VSHUF
 #define VMOVIDUP(A,B,C)                                  VMOVIDUPd(A,B,C)
 #define VMOVRDUP(A,B,C)                                  VMOVRDUPd(A,B,C)
 #define VMADDSUB(A,B,accum)                              VMADDSUBd(A,B,accum) 
-#define VSHUD(A,B)                                       VSHUFd(A,B)
+#define VSHUF(A,B)                                       VSHUFd(A,B)
 
 
 #undef ZEND1
diff --git a/lib/simd/Intel512single.h b/lib/simd/Intel512single.h
index c94a7852..3a39c6a4 100644
--- a/lib/simd/Intel512single.h
+++ b/lib/simd/Intel512single.h
@@ -109,7 +109,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 #undef VMOVIDUP
 #undef VMOVRDUP
-#undef VMADDSBUB
+#undef VMADDSUB
 #undef VSHUF
 #define VMOVIDUP(A,B,C)                                  VMOVIDUPf(A,B,C)
 #define VMOVRDUP(A,B,C)                                  VMOVRDUPf(A,B,C)
diff --git a/lib/simd/Intel512wilson.h b/lib/simd/Intel512wilson.h
index 64087ea6..243b89ed 100644
--- a/lib/simd/Intel512wilson.h
+++ b/lib/simd/Intel512wilson.h
@@ -302,7 +302,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #define MULT_2SPIN_PFXP(ptr,pf) MULT_2SPIN(ptr)
 
 // MULT_2SPINa(ptr)        MULT_2SPIN_PF(ptr,ptr,VPREFETCHG);
-#define MULT_2SPIN(ptr) MULT_ADDSUB_2SPIN(ptr);
 
 #if 0
 #define MULT_2SPIN_PF(ptr,pf,VPF)			\
@@ -816,4 +815,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
            VMADDSUB(Z5,Chi_12,UChi_12)\
                                                 );
 
+#define MULT_2SPIN(ptr) MULT_ADDSUB_2SPIN(ptr)
+
 #endif