diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c
index 55a481983..dd25af220 100644
--- a/src/lv_misc/lv_mem.c
+++ b/src/lv_misc/lv_mem.c
@@ -382,8 +382,11 @@ lv_res_t lv_mem_test(void)
     lv_mem_ent_t * e;
     e = ent_get_next(NULL);
     while(e) {
-        if((e->header.s.used && e->header.s.d_size > LV_MEM_SIZE) ||
-           (e->header.s.used == 0 && e->header.s.d_size > LV_MEM_SIZE)) {
+        if(e->header.s.d_size > LV_MEM_SIZE) {
+            return LV_RES_INV;
+        }
+        uint8_t * e8 = (uint8_t*) e;
+        if(e8 + e->header.s.d_size > work_mem + LV_MEM_SIZE) {
             return LV_RES_INV;
         }
         e = ent_get_next(e);
diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c
index 251f73adb..0ae390163 100644
--- a/src/lv_themes/lv_theme_material.c
+++ b/src/lv_themes/lv_theme_material.c
@@ -648,11 +648,12 @@ 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);
     lv_style_set_bg_color(&edge_flash, LV_STATE_DEFAULT,  lv_color_hex3(0x888));
 #endif
+#endif
 }
 
 static void textarea_init(void)