diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index 6e56abd22..e676fdf75 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -1447,7 +1447,10 @@ void cli_sigperf_print()
 		cli_dbgmsg("No event triggered for %s\n", name);
 	    continue;
 	}
+	if (name)
 	name_len = strlen(name);
+	else
+		name_len = 0;
 	if (name_len > max_name_len)
 	    max_name_len = name_len;
 	elem->bc_name = name?name:"\"noname\"";
@@ -1468,7 +1471,7 @@ void cli_sigperf_print()
     cli_infomsg (NULL, "%-*s %*s %*s %*s %*s\n", max_name_len, "=============",
 	    8, "=====", 8, "========", 12, "===========", 9, "=========");
     while (elem->run_count) {
-	cli_infomsg (NULL, "%-*s %*lu %*lu %*lu %*.2f\n", max_name_len, elem->bc_name,
+	cli_infomsg (NULL, "%-*s %*lu %*lu %*zu %*.2f\n", max_name_len, elem->bc_name,
 		     8, elem->run_count, 8, elem->match_count, 
 		12, elem->usecs, 9, (double)elem->usecs/elem->run_count);
 	elem++;
@@ -1516,7 +1519,7 @@ static void sigperf_events_init(struct cli_bc *bc)
     ret = cli_event_define(g_sigevents, g_sigid++, bc_name, ev_int, multiple_sum);
     if (ret) {
 	cli_errmsg("sigperf_events_init: cli_event_define() error for matches event id %d\n", bc->sigmatch_id);
-	bc->sigtime_id = MAX_BC_SIGEVENT_ID+1;
+	bc->sigmatch_id = MAX_BC_SIGEVENT_ID+1;
 	return;
     }
 }