diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc
index 34d737b3103..5ec55ef2179 100644
--- a/storage/innobase/buf/buf0lru.cc
+++ b/storage/innobase/buf/buf0lru.cc
@@ -837,7 +837,7 @@ bool buf_LRU_free_page(buf_page_t *bpage, bool zip)
 		break;
 	case 1:
 		mysql_mutex_lock(&buf_pool.flush_list_mutex);
-		if (const lsn_t om = bpage->oldest_modification()) {
+		if (ut_d(const lsn_t om =) bpage->oldest_modification()) {
 			ut_ad(om == 1);
 			buf_pool.delete_from_flush_list(bpage);
 		}
diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h
index eb6bf56e8dd..ec94354f78e 100644
--- a/storage/innobase/include/page0page.h
+++ b/storage/innobase/include/page0page.h
@@ -421,8 +421,7 @@ inline void page_rec_set_n_owned(buf_block_t *block, rec_t *rec, ulint n_owned,
   ut_ad(block->frame == page_align(rec));
   ut_ad(comp == (page_is_comp(block->frame) != 0));
 
-  if (page_zip_des_t *page_zip= compressed
-      ? buf_block_get_page_zip(block) : nullptr)
+  if (compressed && is_buf_block_get_page_zip(block))
   {
     ut_ad(comp);
     rec_set_bit_field_1(rec, n_owned, REC_NEW_N_OWNED,