diff --git a/OpenCL/m01800.cl b/OpenCL/m01800.cl
index d00d203b7..122605254 100644
--- a/OpenCL/m01800.cl
+++ b/OpenCL/m01800.cl
@@ -455,7 +455,7 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01800_loop (__gl
   wpc_len[6] = 64     + salt_len + pw_len + pw_len;
   wpc_len[7] = pw_len + salt_len + pw_len + 64;
 
-  u64 wpc[8][16] = { 0 };
+  u64 wpc[8][16] = { { 0 } };
 
   for (u32 i = 0; i < 8; i++)
   {
diff --git a/include/kernel_functions.c b/include/kernel_functions.c
index 6a4d3ee60..274e8dbe0 100644
--- a/include/kernel_functions.c
+++ b/include/kernel_functions.c
@@ -284,8 +284,8 @@
 
 #define SHA512_EXPAND(x,y,z,w) (SHA512_S3 (x) + y + SHA512_S2 (z) + w)
 
-#define SHA512_S2_WO(x) (rotate ((x), 64- 1ull) ^ rotate ((x), 64- 8ull) ^ SHIFT_RIGHT_64 ((x), 7))
-#define SHA512_S3_WO(x) (rotate ((x), 64-19ull) ^ rotate ((x), 64-61ull) ^ SHIFT_RIGHT_64 ((x), 6))
+#define SHA512_S2_WO(x) (rotr64 ((x),  1) ^ rotr64 ((x),  8) ^ SHIFT_RIGHT_64 ((x), 7))
+#define SHA512_S3_WO(x) (rotr64 ((x), 19) ^ rotr64 ((x), 61) ^ SHIFT_RIGHT_64 ((x), 6))
 
 #define SHA512_EXPAND_WO(x,y,z,w) (SHA512_S3_WO (x) + y + SHA512_S2_WO (z) + w)
 #endif