diff --git a/src/lv_hal/lv_hal_disp.h b/src/lv_hal/lv_hal_disp.h
index 8f7affc327..4416cfd598 100644
--- a/src/lv_hal/lv_hal_disp.h
+++ b/src/lv_hal/lv_hal_disp.h
@@ -52,10 +52,10 @@ typedef struct {
     void * buf_act;
     uint32_t size; /*In pixel count*/
     lv_area_t area;
-    volatile uint32_t flushing 	        :1;
-    volatile uint32_t flushing_last     :1;
-    volatile uint32_t last_area         :1;
-    volatile uint32_t last_part         :1;
+    volatile int flushing;      /*1: flushing is in progress. (It can't be a bitfield because when it's cleared from IRQ Read-Modify-Write issue might occur)*/
+    volatile int flushing_last; /*1: It was the last chunk to flush. (It can't be a bitfield because when it's cleared from IRQ Read-Modify-Write issue might occur)*/
+    volatile uint32_t last_area         :1; /*1: the last area is being rendered*/
+    volatile uint32_t last_part         :1; /*1: the last part of the current area is being rendered*/
 } lv_disp_buf_t;
 
 /**
diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c
index 0ae3901632..ee3eb101c5 100644
--- a/src/lv_themes/lv_theme_material.c
+++ b/src/lv_themes/lv_theme_material.c
@@ -648,6 +648,7 @@ static void page_init(void)
     lv_style_set_size(&sb, LV_STATE_DEFAULT, LV_DPX(7));
     lv_style_set_pad_right(&sb, LV_STATE_DEFAULT,  LV_DPX(7));
     lv_style_set_pad_bottom(&sb, LV_STATE_DEFAULT,  LV_DPX(7));
+
 #if  LV_USE_ANIMATION
     style_init_reset(&edge_flash);
     lv_style_set_bg_opa(&edge_flash, LV_STATE_DEFAULT, LV_OPA_COVER);