diff --git a/embed/bootloader/messages.c b/embed/bootloader/messages.c
index e00e8ee1..6c981dd9 100644
--- a/embed/bootloader/messages.c
+++ b/embed/bootloader/messages.c
@@ -252,8 +252,6 @@ static void send_msg_features(uint8_t iface_num, const vendor_header * const vhd
     } else {
         MSG_SEND_ASSIGN_VALUE(firmware_present, false);
     }
-
-    // TODO: pass info about installed firmware (vendor, version, etc.)
     MSG_SEND(Features);
 }
 
diff --git a/embed/extmod/modtrezorconfig/norcow.c b/embed/extmod/modtrezorconfig/norcow.c
index 6839d794..472455e4 100644
--- a/embed/extmod/modtrezorconfig/norcow.c
+++ b/embed/extmod/modtrezorconfig/norcow.c
@@ -196,10 +196,7 @@ static void compact()
 
         // copy the last item
         uint32_t posw;
-        r = write_item(norcow_next_sector, offsetw, k, v, l, &posw);
-        if (sectrue != r) {
-            // TODO: error
-        }
+        ensure(write_item(norcow_next_sector, offsetw, k, v, l, &posw), "compaction write failed");
         offsetw = posw;
     }
 
diff --git a/embed/trezorhal/image.h b/embed/trezorhal/image.h
index bfa1ac38..a27fca62 100644
--- a/embed/trezorhal/image.h
+++ b/embed/trezorhal/image.h
@@ -16,8 +16,7 @@
 #define BOOTLOADER_IMAGE_MAXSIZE (1 * IMAGE_CHUNK_SIZE)
 
 #define FIRMWARE_IMAGE_MAGIC     0x465A5254 // TRZF
-#define FIRMWARE_IMAGE_MAXSIZE   (6 * IMAGE_CHUNK_SIZE)
-// TODO: change above limitation to 13 blocks after fixing writing to non-continuous area
+#define FIRMWARE_IMAGE_MAXSIZE   (13 * IMAGE_CHUNK_SIZE)
 
 typedef struct {
     uint32_t magic;