diff --git a/Makefile b/Makefile
index ca945fa99..9b9c8ee7a 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,8 @@ endif
 #
 
 # keep standard at C11 and C++11
-CFLAGS   = -I.              -O3 -DNODEBUG -std=c11   -fPIC
-CXXFLAGS = -I. -I./examples -O3 -DNODEBUG -std=c++11 -fPIC
+CFLAGS   = -I.              -O3 -DNDEBUG -std=c11   -fPIC
+CXXFLAGS = -I. -I./examples -O3 -DNDEBUG -std=c++11 -fPIC
 LDFLAGS  =
 
 # warnings
diff --git a/ggml-opencl.cpp b/ggml-opencl.cpp
index 3ae56fd28..8a87edb88 100644
--- a/ggml-opencl.cpp
+++ b/ggml-opencl.cpp
@@ -111,11 +111,7 @@ void ggml_cl_malloc(size_t req_size, size_t* cur_size, cl_mem_flags flags, cl_me
 void ggml_cl_sgemm_wrapper(const CLBlastLayout order, const CLBlastTranspose trans_a, const CLBlastTranspose trans_b, const int m, const int n, const int k, const float alpha, const void *host_a, const int lda, const float *host_b, const int ldb, const float beta, float *host_c, const int ldc, const int btype) {
     cl_int err = 0;
 
-    cl_event events[4];
-    events[0] = NULL;
-    events[1] = NULL;
-    events[2] = NULL;
-    events[3] = NULL;
+    cl_event events[4] = { NULL };
 
     cl_kernel kernel;
     size_t global, local, size_qb;
@@ -124,22 +120,22 @@ void ggml_cl_sgemm_wrapper(const CLBlastLayout order, const CLBlastTranspose tra
         global = n * k;
 
         switch (btype) {
-        case 2:
+        case GGML_TYPE_Q4_0:
             kernel = kernel_q4_0;
             local = 16;
             size_qb = global * (sizeof(float) + local) / 32;
             break;
-        case 3:
+        case GGML_TYPE_Q4_1:
             kernel = kernel_q4_1;
             local = 16;
             size_qb = global * (sizeof(float) * 2 + local) / 32;
             break;
-        case 4:
+        case GGML_TYPE_Q4_2:
             kernel = kernel_q4_2;
             local = 8;
             size_qb = global * (sizeof(short) + local) / 16;
             break;
-        case 5:
+        case GGML_TYPE_Q4_3:
             kernel = kernel_q4_3;
             local = 8;
             size_qb = global * (sizeof(short) * 2 + local) / 16;
diff --git a/ggml.c b/ggml.c
index fc06acf1e..4bc86110c 100644
--- a/ggml.c
+++ b/ggml.c
@@ -7580,7 +7580,7 @@ static void ggml_compute_forward_mul_mat_f32(
                         1.0f,    y, ne10,
                                  x, ne10,
                         0.0f,    d, ne01,
-                        params->type);
+                        GGML_TYPE_F32);
 #else
                 cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasTrans,
                         ne11, ne01, ne10,
@@ -7814,7 +7814,7 @@ static void ggml_compute_forward_mul_mat_f16_f32(
                         1.0f,    y, ne10,
                                  x, ne10,
                         0.0f,    d, ne01,
-                        params->type);
+                        GGML_TYPE_F32);
 #else
                 const float * x = wdata;
                 const float * y = (float *) ((char *) src1->data + i02*nb12 + i03*nb13);