diff --git a/src/interface.c b/src/interface.c
index 5b9a1331d..53d41d82a 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -2190,7 +2190,7 @@ int search_ui(pixel *vid_buf)
                     drawrect(vid_buf, gx-2, gy-2, XRES/GRID_S+3, YRES/GRID_S+3, 160, 160, 192, 255);
                 else
                     drawrect(vid_buf, gx-2, gy-2, XRES/GRID_S+3, YRES/GRID_S+3, 128, 128, 128, 255);
-                if(own)
+                if(own && search_fav!=1)
                 {
                     if(dp == pos)
                         drawtext(vid_buf, gx+XRES/GRID_S-4, gy-6, "\x86", 255, 48, 32, 255);
@@ -2321,7 +2321,7 @@ int search_ui(pixel *vid_buf)
             lasttime = TIMEOUT;
         }
 
-        if(b && !bq && dp!=-1)
+        if(b && !bq && dp!=-1 && search_fav!=0)
             if(confirm_ui(vid_buf, "Do you want to delete?", search_names[dp], "Delete"))
             {
                 execute_delete(vid_buf, search_ids[dp]);
@@ -2888,7 +2888,7 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date)
             }
         }
 		//Delete Button
-		if(mx > 200 && mx < 200+50 && my > YRES+MENUSIZE-68 && my < YRES+MENUSIZE-50 && (authoritah || myown) && !queue_open) {
+		if(mx > 200 && mx < 200+50 && my > YRES+MENUSIZE-68 && my < YRES+MENUSIZE-50 && (authoritah || myown) && !queue_open && ) {
 			fillrect(vid_buf, 200, YRES+MENUSIZE-68, 50, 18, 255, 255, 255, 40);
 			if(b && !bq) {
 				//Button Clicked
diff --git a/src/main.c b/src/main.c
index f024aecc4..17e78277c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -249,7 +249,7 @@ void *build_save(int *size, int x0, int y0, int w, int h)
             d[p++] = bmap[y][x];
     for(y=by0; y<by0+bh; y++)
         for(x=bx0; x<bx0+bw; x++)
-            if(bmap[y][x]==WL_FAN)
+            if(bmap[y][x]==WL_FAN||bmap[y][x]==4)
             {
                 i = (int)(fvx[y][x]*64.0f+127.5f);
                 if(i<0) i=0;
@@ -258,7 +258,7 @@ void *build_save(int *size, int x0, int y0, int w, int h)
             }
     for(y=by0; y<by0+bh; y++)
         for(x=bx0; x<bx0+bw; x++)
-            if(bmap[y][x]==WL_FAN)
+            if(bmap[y][x]==WL_FAN||bmap[y][x]==4)
             {
                 i = (int)(fvy[y][x]*64.0f+127.5f);
                 if(i<0) i=0;
@@ -536,7 +536,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
         }
     for(y=by0; y<by0+bh; y++)
         for(x=bx0; x<bx0+bw; x++)
-            if(d[(y-by0)*bw+(x-bx0)]==4)
+            if(d[(y-by0)*bw+(x-bx0)]==4||d[(y-by0)*bw+(x-bx0)]==WL_FAN)
             {
                 if(p >= size)
                     goto corrupt;
@@ -544,7 +544,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
             }
     for(y=by0; y<by0+bh; y++)
         for(x=bx0; x<bx0+bw; x++)
-            if(d[(y-by0)*bw+(x-bx0)]==4)
+            if(d[(y-by0)*bw+(x-bx0)]==4||d[(y-by0)*bw+(x-bx0)]==WL_FAN)
             {
                 if(p >= size)
                     goto corrupt;