diff --git a/src/audio/src/src_hifi2ep.c b/src/audio/src/src_hifi2ep.c
index 06591116d4ed..b8e2a9431bcf 100644
--- a/src/audio/src/src_hifi2ep.c
+++ b/src/audio/src/src_hifi2ep.c
@@ -314,7 +314,7 @@ void src_polyphase_stage_cir(struct src_stage_prm *s)
 	struct src_stage *cfg = s->stage;
 	int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size];
 	int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size];
-	const void *cp; /* Can be int32_t or int16_t */
+	const char *cp; /* Can be int32_t or int16_t */
 	const size_t out_size = fir->out_delay_size * sizeof(int32_t);
 	const int nch = s->nch;
 	const int nch_x_odm = cfg->odm * nch;
@@ -438,7 +438,7 @@ void src_polyphase_stage_cir_s16(struct src_stage_prm *s)
 	struct src_stage *cfg = s->stage;
 	int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size];
 	int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size];
-	const void *cp; /* Can be int32_t or int16_t */
+	const char *cp; /* Can be int32_t or int16_t */
 	const size_t out_size = fir->out_delay_size * sizeof(int32_t);
 	const int nch = s->nch;
 	const int nch_x_odm = cfg->odm * nch;
diff --git a/src/lib/alloc.c b/src/lib/alloc.c
index 11c391516637..47cc2f449a33 100644
--- a/src/lib/alloc.c
+++ b/src/lib/alloc.c
@@ -437,7 +437,7 @@ static void *get_ptr_from_heap(struct mm_heap *heap, int zone, uint32_t caps,
 static void free_block(void *ptr)
 {
 	struct mm_heap *heap;
-	struct block_map *block_map;
+	struct block_map *block_map = NULL;
 	struct block_hdr *hdr;
 	int i;
 	int block;