diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 65df027c30..f00badba69 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -129,7 +129,13 @@ static volatile unsigned int transfer_error[NUM_VOLUMES];
 static unsigned char aligned_buffer[UNALIGNED_NUM_SECTORS* SECTOR_SIZE] __attribute__((aligned(32)));   /* align on cache line size */
 static unsigned char *uncached_buffer = UNCACHED_ADDR(&aligned_buffer[0]);
 
-static inline void mci_delay(void) { int i = 0xffff; while(i--) ; }
+static inline void mci_delay(void)
+{
+    int i = 0xffff;
+    do {
+        asm volatile("nop\n");
+    } while (--i);
+}
 
 #ifdef HAVE_HOTSWAP
 static int sd1_oneshot_callback(struct timeout *tmo)
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
index 735020cfad..c9dd69d47b 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
@@ -46,7 +46,7 @@ static int xoffset = 20; /* needed for flip */
 /* we need to write a red pixel for correct button reads
  * (see lcd_button_support()),but that must not happen while the lcd is updating
  * so block lcd_button_support the during updates */
-static bool lcd_busy = false;
+static volatile int lcd_busy = false;
 
 static inline void lcd_delay(int x)
 {
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h
index 0608f50a02..96afba4568 100644
--- a/firmware/target/arm/system-arm.h
+++ b/firmware/target/arm/system-arm.h
@@ -243,7 +243,7 @@ static inline void enable_interrupt(int mask)
         "mrs     %0, cpsr   \n"
         "bic     %0, %0, %1 \n"
         "msr     cpsr_c, %0 \n"
-        : "=&r"(tmp) : "i"(mask));
+        : "=&r"(tmp) : "r"(mask));
 }
 
 static inline void disable_interrupt(int mask)
@@ -254,7 +254,7 @@ static inline void disable_interrupt(int mask)
         "mrs     %0, cpsr   \n"
         "orr     %0, %0, %1 \n"
         "msr     cpsr_c, %0 \n"
-        : "=&r"(tmp) : "i"(mask));
+        : "=&r"(tmp) : "r"(mask));
 }
 
 static inline int disable_interrupt_save(int mask)
@@ -266,7 +266,7 @@ static inline int disable_interrupt_save(int mask)
         "orr     %0, %1, %2 \n"
         "msr     cpsr_c, %0 \n"
         : "=&r"(tmp), "=&r"(cpsr)
-        : "i"(mask));
+        : "r"(mask));
     return cpsr;
 }