diff --git a/hw/mcu/native/src/hal_flash.c b/hw/mcu/native/src/hal_flash.c
index b39b5158ce..439f9d4fa0 100644
--- a/hw/mcu/native/src/hal_flash.c
+++ b/hw/mcu/native/src/hal_flash.c
@@ -152,7 +152,7 @@ static int
 flash_native_write_internal(uint32_t address, const void *src, uint32_t length,
                             int allow_overwrite)
 {
-    static uint8_t buf[256];
+    uint8_t buf[256] = {0};
     uint32_t cur;
     uint32_t end;
     int chunk_sz;
diff --git a/sys/log/full/selftest/fcb2_align1_imghash/syscfg.yml b/sys/log/full/selftest/fcb2_align1_imghash/syscfg.yml
index fba07594da..fa4b33f97e 100644
--- a/sys/log/full/selftest/fcb2_align1_imghash/syscfg.yml
+++ b/sys/log/full/selftest/fcb2_align1_imghash/syscfg.yml
@@ -23,3 +23,7 @@ syscfg.vals:
 
     # The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
     MSYS_1_BLOCK_COUNT: 1000
+    LOG_FLAGS_IMAGE_HASH: 1
+    IMGMGR_DUMMY_HDR: 1
+    LOG_MGMT: 0
+    IMG_MGMT: 0
diff --git a/sys/log/full/selftest/fcb2_align1_imghash_num_entries/syscfg.yml b/sys/log/full/selftest/fcb2_align1_imghash_num_entries/syscfg.yml
index 4da7c52913..9b36728a94 100644
--- a/sys/log/full/selftest/fcb2_align1_imghash_num_entries/syscfg.yml
+++ b/sys/log/full/selftest/fcb2_align1_imghash_num_entries/syscfg.yml
@@ -19,9 +19,12 @@
 syscfg.vals:
     LOG_FCB2: 1
     MCU_FLASH_MIN_WRITE_SIZE: 1
-    LOG_FLAGS_IMAGE_HASH: 1
-    LOG_FLAGS_TLV_SUPPORT: 1
-    LOG_TLV_NUM_ENTRIES: 1
 
     # The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
     MSYS_1_BLOCK_COUNT: 1000
+    LOG_FLAGS_IMAGE_HASH: 1
+    LOG_FLAGS_TLV_SUPPORT: 1
+    LOG_TLV_NUM_ENTRIES: 1
+    IMGMGR_DUMMY_HDR: 1
+    LOG_MGMT: 0
+    IMG_MGMT: 0
diff --git a/sys/log/full/selftest/util/src/log_test_util.c b/sys/log/full/selftest/util/src/log_test_util.c
index f0af07a1fb..b8ee2ecd7d 100644
--- a/sys/log/full/selftest/util/src/log_test_util.c
+++ b/sys/log/full/selftest/util/src/log_test_util.c
@@ -60,10 +60,10 @@ struct dummy_log dummy_log = {
         .ue_etype = 3,
         .ue_flags = 0
 #if MYNEWT_VAL(LOG_FLAGS_IMAGE_HASH)
-            | LOG_FLAGS_IMG_HASH
+                    | LOG_FLAGS_IMG_HASH
 #endif
 #if MYNEWT_VAL(LOG_FLAGS_TLV_SUPPORT)
-            | LOG_FLAGS_TLV_SUPPORT
+                    | LOG_FLAGS_TLV_SUPPORT
 #endif
         ,
         .ue_etype = 0,
@@ -72,8 +72,8 @@ struct dummy_log dummy_log = {
         .ue_num_entries = 5
     },
     .tlv = {
-       .tag = LOG_TLV_NUM_ENTRIES,
-       .len = LOG_NUM_ENTRIES_SIZE
+        .tag = LOG_TLV_NUM_ENTRIES,
+        .len = LOG_NUM_ENTRIES_SIZE
     },
     .num_entries = 0,
 };
diff --git a/sys/log/full/src/log_fcb2.c b/sys/log/full/src/log_fcb2.c
index 6372ab0dc8..94413c4c65 100644
--- a/sys/log/full/src/log_fcb2.c
+++ b/sys/log/full/src/log_fcb2.c
@@ -439,7 +439,6 @@ log_fcb2_append_mbuf_body(struct log *log, const struct log_entry_hdr *hdr,
             return rc;
         }
         len += LOG_NUM_ENTRIES_SIZE;
-        loc.fe_data_off += len;
         log->l_num_entries++;
 #endif
     }