diff --git a/OpenCL/inc_types.cl b/OpenCL/inc_types.cl
index b3d9e0d0a..095970446 100644
--- a/OpenCL/inc_types.cl
+++ b/OpenCL/inc_types.cl
@@ -1158,7 +1158,6 @@ typedef struct blake2
   u64 f[2];
   u32 buflen;
   u32 outlen;
-  u8  last_node;
 
 } blake2_t;
 
@@ -1918,7 +1917,7 @@ typedef struct dpapimk_tmp_v2
   u64 dgst64[16];
   u64 out64[16];
 
-  u32 userKey[5];
+  u32 userKey[8];
 
 } dpapimk_tmp_v2_t;
 
diff --git a/docs/changes.txt b/docs/changes.txt
index 883afe511..74ff61357 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -37,6 +37,7 @@
 - Allow hashfile for -m 16800 to be used with -m 16801
 - Make the masks parser more restrictive by rejecting a single '?' at the end of the mask (use ?? instead)
 - Add a periodic check for read timeouts in stdin/pipe mode and abort if no input was provided
+- Workaround some padding issues with host compiler and OpenCL JiT on 32 and 64 bit systems
 
 ##
 ## Bugs
diff --git a/include/interface.h b/include/interface.h
index bf9649e25..db16e32c6 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -142,7 +142,6 @@ typedef struct blake2
   u64 f[2];
   u32 buflen;
   u32 outlen;
-  u8  last_node;
 
 } blake2_t;
 
@@ -969,7 +968,7 @@ typedef struct dpapimk_tmp_v2
   u64 dgst64[16];
   u64 out64[16];
 
-  u32 userKey[5];
+  u32 userKey[8];
 
 } dpapimk_tmp_v2_t;