diff --git a/src/storage/datastorage.c b/src/storage/datastorage.c
index f00dac8..9a0756d 100644
--- a/src/storage/datastorage.c
+++ b/src/storage/datastorage.c
@@ -715,7 +715,7 @@ int probe_array_update_rssi(uint8_t bssid_addr[], uint8_t client_addr[], uint32_
 probe_entry probe_array_get_entry(uint8_t bssid_addr[], uint8_t client_addr[]) {
 
     int i;
-    probe_entry tmp;
+    probe_entry tmp = { .bssid_addr = {0,0,0,0,0,0}, .client_addr = {0,0,0,0,0,0}};
 
     if (probe_entry_last == -1) {
         return tmp;
@@ -795,7 +795,7 @@ int ap_get_collision_count(int col_domain) {
 }
 
 ap ap_array_get_ap(uint8_t bssid_addr[]) {
-    ap ret;
+    ap ret = {.bssid_addr = {0,0,0,0,0,0}};
 
     if (ap_entry_last == -1) {
         return ret;
diff --git a/src/utils/ubus.c b/src/utils/ubus.c
index 2804aa3..3b28567 100644
--- a/src/utils/ubus.c
+++ b/src/utils/ubus.c
@@ -705,7 +705,7 @@ static int subscribe_to_hostapd_interfaces(const char *hostapd_dir) {
     }
     while ((entry = readdir(dirp)) != NULL) {
         if (entry->d_type == DT_SOCK) {
-            char subscribe_name[256];
+            char subscribe_name[300];
             sprintf(subscribe_name, "hostapd.%s", entry->d_name);
             add_subscriber(subscribe_name);
         }