diff --git a/firmware/Makefile b/firmware/Makefile
index 74a642814e..193738731a 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -50,6 +50,7 @@ include ../Makefile.include
 CFLAGS += -Wno-sequence-point
 CFLAGS += -Iprotob -DPB_FIELD_16BIT=1
 CFLAGS += -DQR_MAX_VERSION=0
+CFLAGS += -DUSE_PUBKEY_VALIDATE=0
 CFLAGS += -DDEBUG_LINK=0
 CFLAGS += -DDEBUG_LOG=0
 CFLAGS += -DSCM_REVISION='"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')"'
diff --git a/firmware/crypto.c b/firmware/crypto.c
index 7cd4fd9f98..24c2998fa1 100644
--- a/firmware/crypto.c
+++ b/firmware/crypto.c
@@ -301,11 +301,11 @@ int cryptoMultisigPubkeyIndex(const MultisigRedeemScriptType *multisig, const ui
 
 int cryptoMultisigFingerprint(const MultisigRedeemScriptType *multisig, uint8_t *hash)
 {
+	static const HDNodePathType *ptr[15], *swap;
 	const uint32_t n = multisig->pubkeys_count;
 	if (n > 15) {
 		return 0;
 	}
-	const HDNodePathType *ptr[n], *swap;
 	uint32_t i, j;
 	// check sanity
 	for (i = 0; i < n; i++) {
diff --git a/gen/fonts.c b/gen/fonts.c
index 5d2787e2b3..a9f23df755 100644
--- a/gen/fonts.c
+++ b/gen/fonts.c
@@ -1,6 +1,6 @@
 #include "fonts.h"
 
-const uint8_t *font_data[256] = {
+const uint8_t * const font_data[256] = {
 	/* 0x00 _ */ (uint8_t *)"\x01\x00",
 	/* 0x01 _ */ (uint8_t *)"\x01\x00",
 	/* 0x02 _ */ (uint8_t *)"\x01\x00",
diff --git a/gen/fonts.h b/gen/fonts.h
index ecb5195285..43ca21a6fb 100644
--- a/gen/fonts.h
+++ b/gen/fonts.h
@@ -5,7 +5,7 @@
 
 #define FONT_HEIGHT 8
 
-extern const uint8_t *font_data[256];
+extern const uint8_t * const font_data[256];
 
 int fontCharWidth(char c);
 const uint8_t *fontCharData(char c);
diff --git a/layout.c b/layout.c
index 7848b49e46..cdcc034901 100644
--- a/layout.c
+++ b/layout.c
@@ -82,8 +82,20 @@ void layoutDialog(LayoutDialogIcon icon, const char *btnNo, const char *btnYes,
 void layoutProgressUpdate(bool refresh)
 {
 	static uint8_t step = 0;
-	const BITMAP *bmp_gears[4] = { &bmp_gears0, &bmp_gears1, &bmp_gears2, &bmp_gears3 };
-	oledDrawBitmap(40, 0, bmp_gears[step]);
+	switch (step) {
+		case 0:
+			oledDrawBitmap(40, 0, &bmp_gears0);
+			break;
+		case 1:
+			oledDrawBitmap(40, 0, &bmp_gears1);
+			break;
+		case 2:
+			oledDrawBitmap(40, 0, &bmp_gears2);
+			break;
+		case 3:
+			oledDrawBitmap(40, 0, &bmp_gears3);
+			break;
+	}
 	step = (step + 1) % 4;
 	if (refresh) {
 		oledRefresh();