diff --git a/include/types.h b/include/types.h
index 4c9d58be3..eaec87d71 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1121,7 +1121,7 @@ typedef struct
   cs_t   mp_sys[6];
   cs_t   mp_usr[4];
 
-  u32    bfs_cnt;
+  u64    bfs_cnt;
 
   cs_t  *css_buf;
   u32    css_cnt;
diff --git a/src/mpsp.c b/src/mpsp.c
index 124dee207..a0bafb86f 100644
--- a/src/mpsp.c
+++ b/src/mpsp.c
@@ -706,6 +706,9 @@ void sp_setup_tbl (const char *shared_dir, char *hcstat, uint disable, uint clas
 
 void sp_tbl_to_css (hcstat_table_t *root_table_buf, hcstat_table_t *markov_table_buf, cs_t *root_css_buf, cs_t *markov_css_buf, uint threshold, uint uniq_tbls[SP_PW_MAX][CHARSIZ])
 {
+  memset (root_css_buf,   0, SP_PW_MAX *           sizeof (cs_t));
+  memset (markov_css_buf, 0, SP_PW_MAX * CHARSIZ * sizeof (cs_t));
+
   /**
    * Convert tables to css
    */