diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index 87f1d7e88c..f7ee2ce5b6 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -337,7 +337,11 @@ evas_object_smart_cleanup(Evas_Object *obj)
    
    s = obj->smart.smart;
    while (obj->smart.contained)
-     obj->smart.contained = evas_list_remove(obj->smart.contained, obj->smart.contained->data);
+     {
+	/* null out smart parent object - maybe a hole to creep through? */
+	((Evas_Object *)obj->smart.contained->data)->smart.parent = NULL;
+	obj->smart.contained = evas_list_remove(obj->smart.contained, obj->smart.contained->data);
+     }
    while (obj->smart.callbacks)
      {
 	Evas_Smart_Callback *cb;
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index ceb997b26e..9a0d9dec48 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -10,6 +10,7 @@
  * 
  * things to add:
  * 
+ * * height increased by 3 (or 1) even if no underline on last line - fix
  * * finish off current api where it is unfinished
  * * get native extents
  * * styles (outline, glow, etxra glow, shadow, soft shadow, etc.)