diff --git a/OpenCL/inc_types.cl b/OpenCL/inc_types.cl
index 3911c3d75..569c7c9b5 100644
--- a/OpenCL/inc_types.cl
+++ b/OpenCL/inc_types.cl
@@ -8,6 +8,11 @@ typedef ushort u16;
 typedef uint   u32;
 typedef ulong  u64;
 
+typedef u8  u8a  __attribute__ ((aligned (8)));
+typedef u16 u16a __attribute__ ((aligned (8)));
+typedef u32 u32a __attribute__ ((aligned (8)));
+typedef u64 u64a __attribute__ ((aligned (8)));
+
 #ifndef NEW_SIMD_CODE
 #undef  VECT_SIZE
 #define VECT_SIZE 1
diff --git a/OpenCL/m09100.cl b/OpenCL/m09100.cl
index bf6301725..7faabb67f 100644
--- a/OpenCL/m09100.cl
+++ b/OpenCL/m09100.cl
@@ -17,11 +17,19 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-__constant char lotus64_table[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/";
+__constant u8a lotus64_table[64] =
+{
+  '0', '1', '2', '3', '4', '5', '6', '7',
+  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+  'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+  'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+  'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+  'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+  'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+  'u', 'v', 'w', 'x', 'y', 'z', '+', '/',
+};
 
-#define uint_to_hex_upper8(i) l_bin2asc[(i)]
-
-__constant u32 lotus_magic_table[256] =
+__constant u8a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
@@ -57,6 +65,8 @@ __constant u32 lotus_magic_table[256] =
   0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab,
 };
 
+#define uint_to_hex_upper8(i) l_bin2asc[(i)]
+
 #if   VECT_SIZE == 1
 #define BOX1(S,i) (S)[(i)]
 #elif VECT_SIZE == 2