diff --git a/src/dmdevfs.c b/src/dmdevfs.c
index 9e2949d..c8ed93a 100644
--- a/src/dmdevfs.c
+++ b/src/dmdevfs.c
@@ -684,7 +684,7 @@ dmod_dmfsi_dif_api_declaration( 1.0, dmdevfs, int, _readdir, (dmfsi_context_t ct
         // Extract basename from the full path for the directory entry
         read_base_name(driver->path, entry->name, sizeof(entry->name));
         
-        dmdrvi_stat_t stat;
+        dmdrvi_stat_t stat = {0};
         int res = driver_stat(driver, driver->path, &stat);
         if (res != 0)
         {
@@ -951,6 +951,7 @@ static driver_node_t* configure_driver(const char* driver_name, dmini_context_t
         DMOD_LOG_STEP(1, "Failed to configure driver: %s\n", driver_name);
         return NULL;
     }
+    memset(driver_node, 0, sizeof(driver_node_t));
 
     DMOD_LOG_STEP_PROGRESS(75, "Creating driver context: %s\n", driver_name);
     driver_node->was_loaded = was_loaded;