diff --git a/src/encode_coding_tree.c b/src/encode_coding_tree.c
index f5531d63..46552a12 100644
--- a/src/encode_coding_tree.c
+++ b/src/encode_coding_tree.c
@@ -148,7 +148,7 @@ bool uvg_is_lfnst_allowed(
         int local_split_x = split_loc.x;
         int local_split_y = split_loc.y;
         uvg_get_isp_cu_arr_coords(&local_split_x, &local_split_y);
-        cu_info_t* split_cu = lcu ? LCU_GET_CU_AT_PX(lcu, local_split_x, local_split_y) : 
+        const cu_info_t* split_cu = lcu ? LCU_GET_CU_AT_PX(lcu, local_split_x, local_split_y) : 
                                     uvg_cu_array_at_const(frame->cu_array, local_split_x, local_split_y);
 
         //if (cbf_is_set(split_cu->cbf, depth, COLOR_Y)) {
@@ -1933,7 +1933,7 @@ void uvg_encode_mvd(encoder_state_t * const state,
 void uvg_get_sub_coeff(const coeff_t *dst, const coeff_t * const src, const int lcu_x, const int lcu_y, const int block_w, const int block_h, const int lcu_width)
 {
   // Take subset of coeff array
-  coeff_t* dst_ptr = dst;
+  coeff_t* dst_ptr = (coeff_t*)dst;
   const coeff_t* coeff_ptr = &src[lcu_x + lcu_y * lcu_width];
   for (int j = 0; j < block_h; ++j) {
     //memcpy(dst_coeff + (j * lcu_width), &coeff[j * tr_width], tr_width * sizeof(coeff_t));
diff --git a/src/rdo.c b/src/rdo.c
index c9f2db05..f7eb2a9e 100644
--- a/src/rdo.c
+++ b/src/rdo.c
@@ -320,7 +320,7 @@ static INLINE double get_coeff_cabac_cost(
   coeff_t sub_coeff[TR_MAX_WIDTH * TR_MAX_WIDTH];
 
   if (coeff_order == COEFF_ORDER_LINEAR) {
-    coeff_ptr = coeff;
+    coeff_ptr = (coeff_t*)coeff;
   }
   else {
     // Coeff order CU