diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 801d90b99f..cb8ccdf737 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -528,7 +528,8 @@ _edje_file_del(Edje *ed)
 		  evas_object_event_callback_del(rp->swallowed_object,
 						 EVAS_CALLBACK_FREE,
 						 _edje_object_part_swallow_free_cb);
-		  evas_object_del(rp->swallowed_object);
+/* I think it would be better swallowed objects dont get deleted */
+/*		  evas_object_del(rp->swallowed_object);*/
 	       }
 	     if (rp->text.text) free(rp->text.text);
 	     if (rp->text.font) free(rp->text.font);
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index 7856d2df11..716faf6ccc 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -41,8 +41,8 @@ _edje_add(Evas_Object *obj)
    ed->clipper = evas_object_rectangle_add(ed->evas);
    evas_object_smart_member_add(ed->clipper, obj);
    evas_object_color_set(ed->clipper, 255, 255, 255, 255);
-   evas_object_move(ed->clipper, -1000000, -1000000);
-   evas_object_resize(ed->clipper, 2000000, 2000000);
+   evas_object_move(ed->clipper, -10000, -10000);
+   evas_object_resize(ed->clipper, 20000, 20000);
    evas_object_pass_events_set(ed->clipper, 1);
    ed->have_objects = 1;
    ed->references = 1;
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index 3782c511cf..be15aab5f1 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -342,7 +342,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
 	     int psize;
 	     
 	     psize = size;
-	     while ((tw > sw) && (size > 0))
+	     while ((tw > sw) && (size > 0) && (tw != 0))
 	       {
 		  psize = size;
 		  size = (size * sw) / tw;
@@ -357,7 +357,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
 	     int psize;
 	     
 	     psize = size;
-	     while ((tw < sw) && (size > 0))
+	     while ((tw < sw) && (size > 0) && (tw != 0))
 	       {
 		  psize = size;
 		  size = (size * sw) / tw;