diff --git a/OpenCL/m14200-pure.cl b/OpenCL/m14200-pure.cl
index bbde0dfb4..7179ba26f 100644
--- a/OpenCL/m14200-pure.cl
+++ b/OpenCL/m14200-pure.cl
@@ -3,7 +3,8 @@
  * License.....: MIT
  */
 
-#define NEW_SIMD_CODE
+// Breaks benchmark in CPU mode -D1
+//#define NEW_SIMD_CODE
 
 #ifdef KERNEL_STATIC
 #include M2S(INCLUDE_PATH/inc_vendor.h)
diff --git a/OpenCL/m30601-pure.cl b/OpenCL/m30601-pure.cl
index 114e33b88..e63853f91 100644
--- a/OpenCL/m30601-pure.cl
+++ b/OpenCL/m30601-pure.cl
@@ -2,7 +2,7 @@
 /**
  * Author......: See docs/credits.txt
  * License.....: MIT
- * 
+ *
  * Based on module m30600
  */
 
@@ -488,7 +488,7 @@ DECLSPEC u32 u16_bin_to_u32_hex (const u32 v)
        | ((v1 < 10) ? '0' + v1 : 'a' - 10 + v1) << 0;
 }
 
-KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m30601_init (KERN_ATTR_TMPS_ESALT (bcrypt_tmp_t, hmac_b64_salt_t))
+KERNEL_FQ KERNEL_FA void m30601_init (KERN_ATTR_TMPS_ESALT (bcrypt_tmp_t, hmac_b64_salt_t))
 {
   /**
    * base
@@ -499,7 +499,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m30601_init (KERN_ATTR_TMPS_
   const u64 lsz = get_local_size (0);
 
   CONSTANT_AS u32a *s_bin2base64 = bin2base64;
-  
+
   if (gid >= GID_CNT) return;
 
   u32 pw[64] = { 0 };
@@ -808,7 +808,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m30601_init (KERN_ATTR_TMPS_
   }
 }
 
-KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m30601_loop (KERN_ATTR_TMPS (bcrypt_tmp_t))
+KERNEL_FQ KERNEL_FA void m30601_loop (KERN_ATTR_TMPS (bcrypt_tmp_t))
 {
   /**
    * base
@@ -1011,7 +1011,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m30601_loop (KERN_ATTR_TMPS
   }
 }
 
-KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m30601_comp (KERN_ATTR_TMPS (bcrypt_tmp_t))
+KERNEL_FQ KERNEL_FA void m30601_comp (KERN_ATTR_TMPS (bcrypt_tmp_t))
 {
   /**
    * base
diff --git a/src/modules/module_14200.c b/src/modules/module_14200.c
index 2eb8e4065..b8bc144f3 100644
--- a/src/modules/module_14200.c
+++ b/src/modules/module_14200.c
@@ -20,9 +20,7 @@ static const u32   DGST_SIZE      = DGST_SIZE_4_4;
 static const u32   HASH_CATEGORY  = HASH_CATEGORY_OS;
 static const char *HASH_NAME      = "RACF KDFAES";
 static const u64   KERN_TYPE      = 14200;
-static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
-                                  | OPTI_TYPE_SLOW_HASH_SIMD_LOOP2
-                                  | OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
+static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE;
 static const u64   OPTS_TYPE      = OPTS_TYPE_ST_UPPER
                                   | OPTS_TYPE_HASH_COPY
                                   | OPTS_TYPE_INIT2
diff --git a/src/modules/module_30601.c b/src/modules/module_30601.c
index 43aebbae7..2e38f5ea0 100644
--- a/src/modules/module_30601.c
+++ b/src/modules/module_30601.c
@@ -1,9 +1,9 @@
 /**
  * Author......: See docs/credits.txt
  * License.....: MIT
- * 
+ *
  * Based on module m30600
- * 
+ *
  * Implementation following https://passlib.readthedocs.io/en/stable/lib/passlib.hash.bcrypt_sha256.html
  * Example hash:pass from passlib website:
  * $bcrypt-sha256$v=2,t=2b,r=12$n79VH.0Q2TMWmt3Oqt9uku$Kq4Noyk3094Y2QlB8NdRT8SvGiI4ft2:password
@@ -318,6 +318,8 @@ void module_init (module_ctx_t *module_ctx)
   module_ctx->module_benchmark_mask           = MODULE_DEFAULT;
   module_ctx->module_benchmark_charset        = MODULE_DEFAULT;
   module_ctx->module_benchmark_salt           = MODULE_DEFAULT;
+  module_ctx->module_bridge_name              = MODULE_DEFAULT;
+  module_ctx->module_bridge_type              = MODULE_DEFAULT;
   module_ctx->module_build_plain_postprocess  = MODULE_DEFAULT;
   module_ctx->module_deep_comp_kernel         = MODULE_DEFAULT;
   module_ctx->module_deprecated_notice        = MODULE_DEFAULT;