diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h
index 308d17fc3..561bc2ab8 100644
--- a/applications/services/gui/canvas.h
+++ b/applications/services/gui/canvas.h
@@ -289,15 +289,14 @@ void canvas_draw_xbm(
 
 /** Draw rotated XBM bitmap
  *
- * @param      canvas  Canvas instance
- * @param      x       x coordinate
- * @param      y       y coordinate
- * @param[in]  width   bitmap width
- * @param[in]  height  bitmap height
- * @param[in]  rotation  bitmap rotation
- * @param      bitmap  pointer to XBM bitmap data
+ * @param      canvas       Canvas instance
+ * @param      x            x coordinate
+ * @param      y            y coordinate
+ * @param[in]  width        bitmap width
+ * @param[in]  height       bitmap height
+ * @param[in]  rotation     bitmap rotation
+ * @param      bitmap_data  pointer to XBM bitmap data
  */
-
 void canvas_draw_xbm_ex(
     Canvas* canvas,
     int32_t x,
diff --git a/firmware.scons b/firmware.scons
index 62b1184eb..4c5e05873 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -216,6 +216,7 @@ fwelf = fwenv["FW_ELF"] = fwenv.Program(
     sources,
     LIBS=fwenv["TARGET_CFG"].linker_dependencies,
 )
+Depends(fwelf, fwenv["LINKER_SCRIPT_PATH"])
 
 # Firmware depends on everything child builders returned
 # Depends(fwelf, lib_targets)
diff --git a/lib/nfc/helpers/iso14443_4_layer.c b/lib/nfc/helpers/iso14443_4_layer.c
index 209549938..4c5dcd6a4 100644
--- a/lib/nfc/helpers/iso14443_4_layer.c
+++ b/lib/nfc/helpers/iso14443_4_layer.c
@@ -25,7 +25,7 @@
 #define ISO14443_4_BLOCK_PCB_S_CID_MASK            (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET)
 #define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK   (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET)
 
-#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & mask) == mask)
+#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & (mask)) == (mask))
 
 #define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \
     ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK)
diff --git a/lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c b/lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c
index 32cc8f198..2519fb90c 100644
--- a/lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c
+++ b/lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c
@@ -65,10 +65,8 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
         if(instance->state == Iso14443_4aListenerStateIdle) {
             if(bit_buffer_get_size_bytes(rx_buffer) == 2 &&
                bit_buffer_get_byte(rx_buffer, 0) == ISO14443_4A_CMD_READ_ATS) {
-                if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) !=
+                if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) ==
                    Iso14443_4aErrorNone) {
-                    command = NfcCommandContinue;
-                } else {
                     instance->state = Iso14443_4aListenerStateActive;
                 }
             }
@@ -93,7 +91,6 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
         if(instance->callback) {
             command = instance->callback(instance->generic_event, instance->context);
         }
-        command = NfcCommandContinue;
     }
 
     return command;
diff --git a/targets/f7/stm32wb55xx_flash.ld b/targets/f7/stm32wb55xx_flash.ld
index 3fb789645..524da6fc3 100644
--- a/targets/f7/stm32wb55xx_flash.ld
+++ b/targets/f7/stm32wb55xx_flash.ld
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _stack_end = 0x20030000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
-_stack_size = 0x1000; /* required amount of stack */
+_stack_size = 0x200; /* required amount of stack */
 
 MEMORY {
     FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 1024K
diff --git a/targets/f7/stm32wb55xx_ram_fw.ld b/targets/f7/stm32wb55xx_ram_fw.ld
index cae30b6e9..f0e8ad678 100644
--- a/targets/f7/stm32wb55xx_ram_fw.ld
+++ b/targets/f7/stm32wb55xx_ram_fw.ld
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _stack_end = 0x20030000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
-_stack_size = 0x1000; /* required amount of stack */
+_stack_size = 0x200; /* required amount of stack */
 
 MEMORY {
     FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 1024K