diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl
index 6112ec296..020ac1619 100644
--- a/OpenCL/m12500-pure.cl
+++ b/OpenCL/m12500-pure.cl
@@ -804,7 +804,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t))
    * base
    */
 
-  const u32 pw_len = pws[gid].pw_len & 255;
+  const u32 pw_len = pws[gid].pw_len;
 
   const u32 salt_len = 8;
 
@@ -970,7 +970,7 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t))
    * base
    */
 
-  const u32 pw_len = pws[gid].pw_len & 255;
+  const u32 pw_len = pws[gid].pw_len;
 
   const u32 salt_len = 8;
 
diff --git a/OpenCL/m23700-pure.cl b/OpenCL/m23700-pure.cl
index 63e84cbf7..c33c5f123 100644
--- a/OpenCL/m23700-pure.cl
+++ b/OpenCL/m23700-pure.cl
@@ -912,7 +912,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
    * base
    */
 
-  const u32 pw_len = pws[gid].pw_len & 255;
+  const u32 pw_len = pws[gid].pw_len;
 
   const u32 salt_len = 8;
 
@@ -1086,7 +1086,7 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
    * base
    */
 
-  const u32 pw_len = pws[gid].pw_len & 255;
+  const u32 pw_len = pws[gid].pw_len;
 
   const u32 salt_len = 8;
 
diff --git a/OpenCL/m23800-pure.cl b/OpenCL/m23800-pure.cl
index 530c3268d..fb38fab7d 100644
--- a/OpenCL/m23800-pure.cl
+++ b/OpenCL/m23800-pure.cl
@@ -823,7 +823,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
    * base
    */
 
-  const u32 pw_len = pws[gid].pw_len & 255;
+  const u32 pw_len = pws[gid].pw_len;
 
   const u32 salt_len = 8;
 
@@ -990,7 +990,7 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_
    * base
    */
 
-  const u32 pw_len = pws[gid].pw_len & 255;
+  const u32 pw_len = pws[gid].pw_len;
 
   const u32 salt_len = 8;
 
diff --git a/OpenCL/m25700_a3-optimized.cl b/OpenCL/m25700_a3-optimized.cl
index 783cf4fef..f879233f3 100644
--- a/OpenCL/m25700_a3-optimized.cl
+++ b/OpenCL/m25700_a3-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_hash_md5.cl"
 #endif
 
-DECLSPEC u32x MurmurHash_w0 (const u32 seed, const u32x w0, const u32 *w, const int pw_len)
+DECLSPEC u32x MurmurHash_w0 (const u32 seed, const u32x w0, const u32x *w, const int pw_len)
 {
   u32x hash = seed;
 
diff --git a/src/backend.c b/src/backend.c
index d2a68e5b0..ebe4d1eb0 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -11111,7 +11111,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
       {
         device_param->skipped = true;
         continue;
-      }      
+      }
     }
 
     /**
@@ -11629,6 +11629,16 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
             device_param->kernel_threads_min = fixed_local_size;
             device_param->kernel_threads_max = fixed_local_size;
           }
+          else
+          {
+            // kernels specific minimum needs to be set so that self-test wont fail
+
+            if (sscanf (jit_build_options, "-D FIXED_LOCAL_SIZE_COMP=%u", &fixed_local_size) == 1)
+            {
+              device_param->kernel_threads_min = fixed_local_size;
+              // device_param->kernel_threads_max = fixed_local_size;
+            }
+          }
         }
       }
 
diff --git a/tools/test_modules/m25700.pm b/tools/test_modules/m25700.pm
index d5c2e2424..56f6c042f 100644
--- a/tools/test_modules/m25700.pm
+++ b/tools/test_modules/m25700.pm
@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-sub module_constraints { [[0, 256], [8, 8], [0, 55], [8, 8], [-1, -1]] }
+sub module_constraints { [[-1, -1], [-1, -1], [0, 55], [8, 8], [-1, -1]] }
 
 sub MurmurHash
 {