diff --git a/clu_runtime/clu.h b/clu_runtime/clu.h
index 6029569..48c99e3 100644
--- a/clu_runtime/clu.h
+++ b/clu_runtime/clu.h
@@ -88,9 +88,9 @@ typedef struct
 /* Platform API                                                                                         */
 /********************************************************************************************************/
 
-CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange1(int global_dim_1, int local_dim_1, int offset_1);
-CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange2(int global_dim_1, int global_dim_2, int local_dim_1, int local_dim_2, int offset_1, int offset_2);
-CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange3(int global_dim_1, int global_dim_2, int global_dim_3, int local_dim_1, int local_dim_2, int local_dim_3, int offset_1, int offset_2, int offset_3);
+CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange1(size_t global_dim_1, size_t local_dim_1, size_t offset_1);
+CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange2(size_t global_dim_1, size_t global_dim_2, size_t local_dim_1, size_t local_dim_2, size_t offset_1, size_t offset_2);
+CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange3(size_t global_dim_1, size_t global_dim_2, size_t global_dim_3, size_t local_dim_1, size_t local_dim_2, size_t local_dim_3, size_t offset_1, size_t offset_2, size_t offset_3);
 
 /* runtime initialization/shutdown APIs */
 extern CLU_API_ENTRY cl_int CLU_API_CALL
@@ -156,27 +156,27 @@ cluWaitOnAnyEvent(const cl_event* event_list,
 /********************************************************************************************************/
 /* APIs INLINEd for performance                                                                         */
 /********************************************************************************************************/
-INLINE CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange1(int global_dim_1, int local_dim_1, int offset_1)
+INLINE CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange1(size_t global_dim_1, size_t local_dim_1, size_t offset_1)
 {
-    clu_nd_range range = {1, {(size_t) global_dim_1, 0, 0}, {(size_t) local_dim_1, 0, 0}, {(size_t) offset_1, 0, 0}};
+    clu_nd_range range = {1, {global_dim_1, 0, 0}, {local_dim_1, 0, 0}, {offset_1, 0, 0}};
     return range;
 }
 
-INLINE CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange2(int global_dim_1, int global_dim_2, int local_dim_1, int local_dim_2, int offset_1, int offset_2)
+INLINE CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange2(size_t global_dim_1, size_t global_dim_2, size_t local_dim_1, size_t local_dim_2, size_t offset_1, size_t offset_2)
 {
-    clu_nd_range range = {2, {(size_t) global_dim_1, (size_t) global_dim_2, 0}, {(size_t) local_dim_1, (size_t) local_dim_2, 0}, {(size_t) offset_1, (size_t) offset_2, 0}};
+    clu_nd_range range = {2, {global_dim_1, global_dim_2, 0}, {local_dim_1, local_dim_2, 0}, {offset_1, offset_2, 0}};
     return range;
 }
 
-INLINE CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange3(int global_dim_1, int global_dim_2, int global_dim_3, int local_dim_1, int local_dim_2, int local_dim_3, int offset_1, int offset_2, int offset_3)
+INLINE CLU_API_ENTRY clu_nd_range CLU_API_CALL cluNDRange3(size_t global_dim_1, size_t global_dim_2, size_t global_dim_3, size_t local_dim_1, size_t local_dim_2, size_t local_dim_3, size_t offset_1, size_t offset_2, size_t offset_3)
 {
-    clu_nd_range range = {3, {(size_t) global_dim_1, (size_t) global_dim_2, (size_t) global_dim_3}, {(size_t) local_dim_1, (size_t) local_dim_2, (size_t) local_dim_3}, {(size_t) offset_1, (size_t) offset_2, (size_t) offset_3}};
+    clu_nd_range range = {3, {global_dim_1, global_dim_2, global_dim_3}, {local_dim_1, local_dim_2, local_dim_3}, {offset_1, offset_2, offset_3}};
     return range;
 }
 
 INLINE CLU_API_ENTRY clu_enqueue_params cluGetDefaultParams()
 {
-    clu_enqueue_params p = {};
+    clu_enqueue_params p = {0};
     return p;
 }