diff --git a/libmariadb/mariadb_rpl.c b/libmariadb/mariadb_rpl.c
index 0ed91bb8..cfaf228d 100644
--- a/libmariadb/mariadb_rpl.c
+++ b/libmariadb/mariadb_rpl.c
@@ -1172,7 +1172,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
       len= rpl_event->event_length - (ev - ev_start) - (rpl->use_checksum ? 4 : 0) - (EVENT_HEADER_OFS - 1);
       RPL_CHECK_POS(ev, ev_end, len);
       rpl_event->event.heartbeat.filename.length= len;
-      rpl_event->event.heartbeat.filename.str= ev;
+      rpl_event->event.heartbeat.filename.str= (char *)ev;
       ev+= len;
       break;
 
diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c
index 594d149f..4f99ab01 100644
--- a/libmariadb/mariadb_stmt.c
+++ b/libmariadb/mariadb_stmt.c
@@ -2224,7 +2224,6 @@ static my_bool madb_reset_stmt(MYSQL_STMT *stmt, unsigned int flags)
 {
   MYSQL *mysql= stmt->mysql;
   my_bool ret= 0;
-  LIST *li_stmt= mysql->stmts;
 
   /* CONC-667: If an other statement has a pending result set, we
      need to return an error */
@@ -2332,7 +2331,7 @@ static my_bool mysql_stmt_internal_reset(MYSQL_STMT *stmt, my_bool is_close)
       stmt->fetch_row_func == stmt_unbuffered_fetch)
     flags|= MADB_RESET_BUFFER;
 
-  if (ret= madb_reset_stmt(stmt, flags))
+  if ((ret= madb_reset_stmt(stmt, flags)))
     return ret;
 
   if (stmt->stmt_id)