diff --git a/config/dunnington/bli_kernel.h b/config/dunnington/bli_kernel.h
index f5d846d9b..0ed2889de 100644
--- a/config/dunnington/bli_kernel.h
+++ b/config/dunnington/bli_kernel.h
@@ -38,6 +38,7 @@
 
 // -- LEVEL-3 MICRO-KERNEL CONSTANTS -------------------------------------------
 
+#undef  BLIS_SIMD_ALIGN_SIZE
 #define BLIS_SIMD_ALIGN_SIZE 16
 
 // -- Cache blocksizes --
diff --git a/frame/1f/kernels/bli_l1f_ref.h b/frame/1f/kernels/bli_l1f_ref.h
index 899a4ba29..592465845 100644
--- a/frame/1f/kernels/bli_l1f_ref.h
+++ b/frame/1f/kernels/bli_l1f_ref.h
@@ -35,21 +35,21 @@
 // Redefine level-1f kernel API names to induce prototypes.
 
 #undef  axpy2v_ker_name
-#define axpy2v_ker_name    axpy2v_ref
+#define axpy2v_ker_name     axpy2v_ref
 
 #undef  dotaxpyv_ker_name
-#define dotaxpyv_ker_name  dotaxpyv_ref
+#define dotaxpyv_ker_name   dotaxpyv_ref
 
 #undef  axpyf_ker_name
-#define axpyf_ker_name     axpyf_ref
+#define axpyf_ker_name      axpyf_ref
 
 #undef  dotxf_ker_name
-#define dotxf_ker_name     dotxf_ref
+#define dotxf_ker_name      dotxf_ref
 
-#undef  dotxaxpy_ker_name
-#define dotxaxpy_ker_name  dotxaxpyf_ref
+#undef  dotxaxpyf_ker_name
+#define dotxaxpyf_ker_name  dotxaxpyf_ref_var2
 
 // Include the level-1f kernel API template.
 
-#include "bli_l1v_ker.h"
+#include "bli_l1f_ker.h"
 
diff --git a/frame/1f/kernels/bli_dotxaxpyf_ref_var1.c b/frame/1f/kernels/other/bli_dotxaxpyf_ref_var1.c
similarity index 100%
rename from frame/1f/kernels/bli_dotxaxpyf_ref_var1.c
rename to frame/1f/kernels/other/bli_dotxaxpyf_ref_var1.c
diff --git a/frame/include/bli_config_macro_defs.h b/frame/include/bli_config_macro_defs.h
index a5bce35c0..a9d713571 100644
--- a/frame/include/bli_config_macro_defs.h
+++ b/frame/include/bli_config_macro_defs.h
@@ -137,19 +137,6 @@
 #define BLIS_POOL_ADDR_ALIGN_SIZE        BLIS_PAGE_SIZE
 
 
-// -- MIXED DATATYPE SUPPORT ---------------------------------------------------
-
-// Basic (homogeneous) datatype support always enabled.
-
-// AVOID ENABLING MIXED DATATYPE SUPPORT! IT IS PROBABLY BROKEN.
-
-// Enable mixed domain operations?
-//#define BLIS_ENABLE_MIXED_DOMAIN_SUPPORT
-
-// Enable extra mixed precision operations?
-//#define BLIS_ENABLE_MIXED_PRECISION_SUPPORT
-
-
 // -- MISCELLANEOUS OPTIONS ----------------------------------------------------
 
 // Stay initialized after auto-initialization, unless and until the user