diff --git a/common_arm/flashmem.c b/common_arm/flashmem.c
index b6ff47fce..4757a46d2 100644
--- a/common_arm/flashmem.c
+++ b/common_arm/flashmem.c
@@ -461,7 +461,7 @@ bool FlashDetect(bool flash_init) {
     if (flash_init) {
         if (!FlashInit()) {
             if (g_dbglevel > 3) Dbprintf("FlashDetect() FlashInit fail");
-            return 0;
+            return false;
         }
     }
 
@@ -483,6 +483,7 @@ bool FlashDetect(bool flash_init) {
     if (flash_init) {
         FlashStop();
     }
+
     return true;
 }
 
@@ -501,8 +502,10 @@ bool FlashInit(void) {
     }
 
 #ifndef AS_BOOTROM
-    if (spi_flash_p64k == 0){
-        if (!FlashDetect(false)) return 0;
+    if (spi_flash_p64k == 0) {
+        if (!FlashDetect(false)) {
+            return false;
+        }
     }
 #endif // #ifndef AS_BOOTROM
 
diff --git a/include/pmflash.h b/include/pmflash.h
index 3d009fc9f..d7791814f 100644
--- a/include/pmflash.h
+++ b/include/pmflash.h
@@ -38,7 +38,7 @@
 # define FLASH_MEM_MAX_SIZE     0x40000  // (262144)
 #endif
 #ifndef FLASH_MEM_MAX_SIZE_P
-# define FLASH_MEM_MAX_SIZE_P(p64k) (1024 * 64 * p64k)
+# define FLASH_MEM_MAX_SIZE_P(p64k) (1024 * 64 * (p64k))
 #endif
 
 #ifndef FLASH_MEM_MAX_4K_SECTOR