diff --git a/database_info.c b/database_info.c
index 32cbf0878d..810347d41c 100644
--- a/database_info.c
+++ b/database_info.c
@@ -471,13 +471,15 @@ error:
 database_info_handle_t *database_info_file_init(const char *path,
       enum database_type type)
 {
-   union string_list_elem_attr attr = {0};
+   union string_list_elem_attr attr;
    database_info_handle_t      *db  = (database_info_handle_t*)
       calloc(1, sizeof(*db));
 
    if (!db)
       return NULL;
 
+   attr.i             = 0;
+
    db->list           = string_list_new();
 
    if (!db->list)
diff --git a/runloop.c b/runloop.c
index 9f403e3d07..71f500755b 100644
--- a/runloop.c
+++ b/runloop.c
@@ -747,7 +747,13 @@ static enum runloop_state runloop_check_state(
 
       if (runloop_core_shutdown_initiated && settings->load_dummy_on_core_shutdown)
       {
-         content_ctx_info_t content_info = {0};
+         content_ctx_info_t content_info;
+
+         content_info.argc               = 0;
+         content_info.argv               = NULL;
+         content_info.args               = NULL;
+         content_info.environ_get        = NULL;
+
          if (!task_push_start_dummy_core(&content_info))
             return RUNLOOP_STATE_QUIT;