diff --git a/lib/nfc/helpers/iso14443_4_layer.c b/lib/nfc/helpers/iso14443_4_layer.c
index 87d820d64..d53aef64f 100644
--- a/lib/nfc/helpers/iso14443_4_layer.c
+++ b/lib/nfc/helpers/iso14443_4_layer.c
@@ -68,6 +68,7 @@ bool iso14443_4_layer_decode_block(
 
     do {
         if(!bit_buffer_starts_with_byte(block_data, instance->pcb_prev)) break;
+        // TODO: Fix crash
         bit_buffer_copy_right(output_data, block_data, 1);
         ret = true;
     } while(false);
diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c
index 857434b88..613e819e9 100644
--- a/lib/subghz/protocols/keeloq.c
+++ b/lib/subghz/protocols/keeloq.c
@@ -429,6 +429,9 @@ static bool
        (strcmp(instance->manufacture_name, "Dea_Mio") == 0)) {
         klq_last_custom_btn = 0xF;
     }
+    if((strcmp(instance->manufacture_name, "FAAC_RC,XT") == 0)) {
+        klq_last_custom_btn = 0xB;
+    }
 
     btn = subghz_protocol_keeloq_get_btn_code(klq_last_custom_btn);
 
diff --git a/lib/toolbox/bit_buffer.c b/lib/toolbox/bit_buffer.c
index 85a52e79d..d8f62ef4c 100644
--- a/lib/toolbox/bit_buffer.c
+++ b/lib/toolbox/bit_buffer.c
@@ -58,6 +58,7 @@ void bit_buffer_copy_right(BitBuffer* buf, const BitBuffer* other, size_t start_
     furi_check(buf);
     furi_check(other);
     furi_check(bit_buffer_get_size_bytes(other) > start_index);
+    // TODO: Fix crash
     furi_check(buf->capacity_bytes >= bit_buffer_get_size_bytes(other) - start_index);
 
     memcpy(buf->data, other->data + start_index, bit_buffer_get_size_bytes(other) - start_index);