diff --git a/components/newlib/include/assert.h b/components/newlib/include/assert.h
index 91bb040cab..df46c030b2 100644
--- a/components/newlib/include/assert.h
+++ b/components/newlib/include/assert.h
@@ -11,7 +11,7 @@ extern "C" {
 #undef assert
 
 #ifdef NDEBUG           /* required by ANSI standard */
-# define assert(__e) ((void)0)
+# define assert(__e) ((void) sizeof(__e))
 #else
 # define assert(__e) ((__e) ? (void)0 : __assert_func (__FILE__, __LINE__, \
 						       __ASSERT_FUNC, #__e))
diff --git a/components/nvs_flash/src/nvs_pagemanager.cpp b/components/nvs_flash/src/nvs_pagemanager.cpp
index f4d02a7d40..768b30667a 100644
--- a/components/nvs_flash/src/nvs_pagemanager.cpp
+++ b/components/nvs_flash/src/nvs_pagemanager.cpp
@@ -163,8 +163,10 @@ esp_err_t PageManager::requestNewPage()
         return err;
     }
 
+#ifndef NDEBUG
     assert(usedEntries == newPage->getUsedEntryCount());
-
+#endif
+    
     mPageList.erase(maxErasedItemsPageIt);
     mFreePageList.push_back(erasedPage);
 
diff --git a/components/spi_flash/flash_ops.c b/components/spi_flash/flash_ops.c
index fffe487bd1..a74558a96f 100644
--- a/components/spi_flash/flash_ops.c
+++ b/components/spi_flash/flash_ops.c
@@ -103,16 +103,18 @@ SpiFlashOpResult IRAM_ATTR spi_flash_unlock()
     return SPI_FLASH_RESULT_OK;
 }
 
-static inline void spi_flash_guard_start()
+static inline void IRAM_ATTR spi_flash_guard_start()
 {
-    if (s_flash_guard_ops)
+    if (s_flash_guard_ops) {
         s_flash_guard_ops->start();
+    }
 }
 
-static inline void spi_flash_guard_end()
+static inline void IRAM_ATTR spi_flash_guard_end()
 {
-    if (s_flash_guard_ops)
+    if (s_flash_guard_ops) {
         s_flash_guard_ops->end();
+    }
 }
 
 esp_err_t IRAM_ATTR spi_flash_erase_sector(size_t sec)