diff --git a/make.sh b/make.sh
index 153c281..f966463 100755
--- a/make.sh
+++ b/make.sh
@@ -132,6 +132,7 @@ fi
 
 cd ..
 cp Makefile.in Makefile
+sed_replace "s#\\\$(CC)#gcc#g" Makefile
 sed_replace "s#\\\$(CFLAGS)#$CFLAGS#g" Makefile
 sed_replace "s#\\\$(LIBS)#$LIBS#g" Makefile
 sed_replace "s#\\\$(TARGET_PREFIX)#$TARGET_PREFIX#g" Makefile
diff --git a/src/sf_binlog_writer.h b/src/sf_binlog_writer.h
index fed5d8f..0e09bca 100644
--- a/src/sf_binlog_writer.h
+++ b/src/sf_binlog_writer.h
@@ -276,7 +276,9 @@ static inline SFBinlogWriterBuffer *sf_binlog_writer_alloc_buffer(
 {
     SFBinlogWriterBuffer *buffer;
 
-    if ((buffer=fast_mblock_alloc_object(&thread->mblock)) != NULL) {
+    if ((buffer=(SFBinlogWriterBuffer *)fast_mblock_alloc_object(
+                    &thread->mblock)) != NULL)
+    {
         buffer->type = SF_BINLOG_BUFFER_TYPE_WRITE_TO_FILE;
     }
     return buffer;