diff --git a/demo/common/overview.c b/demo/common/overview.c
index 45458543b..adc1cf736 100644
--- a/demo/common/overview.c
+++ b/demo/common/overview.c
@@ -392,7 +392,7 @@ overview(struct nk_context *ctx)
                 static const char *weapons[] = {"Fist","Pistol","Shotgun","Plasma","BFG"};
 
                 char buffer[64];
-                size_t sum = 0;
+                unsigned long sum = 0;
 
                 /* default combobox */
                 nk_layout_row_static(ctx, 25, 200, 1);
@@ -443,8 +443,8 @@ overview(struct nk_context *ctx)
                     nk_combo_end(ctx);
                 }
                 /* progressbar combobox */
-                sum = prog_a + prog_b + prog_c + prog_d;
-                sprintf(buffer, "%lu", sum);
+                sum = (unsigned long)(prog_a + prog_b + prog_c + prog_d);
+                snprintf(buffer, sizeof(buffer), "%lu", sum);
                 if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) {
                     nk_layout_row_dynamic(ctx, 30, 1);
                     nk_progress(ctx, &prog_a, 100, NK_MODIFIABLE);
@@ -455,8 +455,8 @@ overview(struct nk_context *ctx)
                 }
 
                 /* checkbox combobox */
-                sum = (size_t)(check_values[0] + check_values[1] + check_values[2] + check_values[3] + check_values[4]);
-                sprintf(buffer, "%lu", sum);
+                sum = (unsigned long)(check_values[0] + check_values[1] + check_values[2] + check_values[3] + check_values[4]);
+                snprintf(buffer, sizeof(buffer), "%lu", sum);
                 if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) {
                     nk_layout_row_dynamic(ctx, 30, 1);
                     nk_checkbox_label(ctx, weapons[0], &check_values[0]);
@@ -467,7 +467,7 @@ overview(struct nk_context *ctx)
                 }
 
                 /* complex text combobox */
-                sprintf(buffer, "%.2f, %.2f, %.2f", position[0], position[1],position[2]);
+                snprintf(buffer, sizeof(buffer), "%.2f, %.2f, %.2f", position[0], position[1],position[2]);
                 if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) {
                     nk_layout_row_dynamic(ctx, 25, 1);
                     nk_property_float(ctx, "#X:", -1024.0f, &position[0], 1024.0f, 1,0.5f);
@@ -477,7 +477,7 @@ overview(struct nk_context *ctx)
                 }
 
                 /* chart combobox */
-                sprintf(buffer, "%.1f", chart_selection);
+                snprintf(buffer, sizeof(buffer), "%.1f", chart_selection);
                 if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,250))) {
                     size_t i = 0;
                     static const float values[]={26.0f,13.0f,30.0f,15.0f,25.0f,10.0f,20.0f,40.0f, 12.0f, 8.0f, 22.0f, 28.0f, 5.0f};
@@ -510,7 +510,7 @@ overview(struct nk_context *ctx)
                     }
 
                     /* time combobox */
-                    sprintf(buffer, "%02d:%02d:%02d", sel_time.tm_hour, sel_time.tm_min, sel_time.tm_sec);
+                    snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d", sel_time.tm_hour, sel_time.tm_min, sel_time.tm_sec);
                     if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,250))) {
                         time_selected = 1;
                         nk_layout_row_dynamic(ctx, 25, 1);
@@ -521,7 +521,7 @@ overview(struct nk_context *ctx)
                     }
 
                     /* date combobox */
-                    sprintf(buffer, "%02d-%02d-%02d", sel_date.tm_mday, sel_date.tm_mon+1, sel_date.tm_year+1900);
+                    snprintf(buffer, sizeof(buffer), "%02d-%02d-%02d", sel_date.tm_mday, sel_date.tm_mon+1, sel_date.tm_year+1900);
                     if (nk_combo_begin_label(ctx, buffer, nk_vec2(350,400)))
                     {
                         int i = 0;
@@ -547,7 +547,7 @@ overview(struct nk_context *ctx)
                             } else sel_date.tm_mon--;
                         }
                         nk_layout_row_push(ctx, 0.9f);
-                        sprintf(buffer, "%s %d", month[sel_date.tm_mon], year);
+                        snprintf(buffer, sizeof(buffer), "%s %d", month[sel_date.tm_mon], year);
                         nk_label(ctx, buffer, NK_TEXT_CENTERED);
                         nk_layout_row_push(ctx, 0.05f);
                         if (nk_button_symbol(ctx, NK_SYMBOL_TRIANGLE_RIGHT)) {
@@ -575,7 +575,7 @@ overview(struct nk_context *ctx)
                         /* days  */
                         if (week_day > 0) nk_spacing(ctx, week_day);
                         for (i = 1; i <= days; ++i) {
-                            sprintf(buffer, "%d", i);
+                            snprintf(buffer, sizeof(buffer), "%d", i);
                             if (nk_button_label(ctx, buffer)) {
                                 sel_date.tm_mday = i;
                                 nk_combo_close(ctx);
@@ -1085,7 +1085,7 @@ overview(struct nk_context *ctx)
                     char buffer[64];
                     nk_layout_row_static(ctx, 18, 150, 1);
                     for (i = 0; i < 64; ++i) {
-                        sprintf(buffer, "0x%02x", i);
+                        snprintf(buffer, sizeof(buffer), "0x%02x", i);
                         nk_labelf(ctx, NK_TEXT_LEFT, "%s: scrollable region", buffer);
                     }
                     nk_group_end(ctx);
@@ -1095,7 +1095,7 @@ overview(struct nk_context *ctx)
                     char buffer[64];
                     nk_layout_row_dynamic(ctx, 25, 2);
                     for (i = 0; i < 64; ++i) {
-                        sprintf(buffer, "%08d", ((((i%7)*10)^32))+(64+(i%2)*2));
+                        snprintf(buffer, sizeof(buffer), "%08d", ((((i%7)*10)^32))+(64+(i%2)*2));
                         nk_button_label(ctx, buffer);
                     }
                     nk_group_end(ctx);
diff --git a/nuklear.h b/nuklear.h
index e27be460b..638ff4a35 100644
--- a/nuklear.h
+++ b/nuklear.h
@@ -25473,6 +25473,7 @@ nk_draw_selectable(struct nk_command_buffer *out,
 {
     const struct nk_style_item *background;
     struct nk_text text;
+    nk_zero_struct(text);
     text.padding = style->padding;
 
     /* select correct colors/images */
@@ -29944,6 +29945,7 @@ nk_combo_begin_symbol(struct nk_context *ctx, enum nk_symbol_type symbol, struct
     const struct nk_style_item *background;
     struct nk_color sym_background;
     struct nk_color symbol_color;
+    nk_zero_struct(sym_background);
 
     NK_ASSERT(ctx);
     NK_ASSERT(ctx->current);
@@ -30041,6 +30043,7 @@ nk_combo_begin_symbol_text(struct nk_context *ctx, const char *selected, int len
     const struct nk_style_item *background;
     struct nk_color symbol_color;
     struct nk_text text;
+    nk_zero_struct(text);
 
     NK_ASSERT(ctx);
     NK_ASSERT(ctx->current);