diff --git a/TODO b/TODO
index 8affbd286..d6539fbec 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,8 @@ Some of the things (in very short form) that need to be done to E17...
   BUGS / FIXES
 -------------------------------------------------------------------------------
 
+* BUG: set any specific border type and when you maximize the border changes
+  to default (unless its borderless)
 * BUG: change exe name in basic mode in eap editor and icon vanishes (don't
   extract existing icon and write out to tmp .png while rebuilding).
 * BUG: resolution (xrandr) changes seem to screw the shelf up a bit.
diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index fdd1b1921..ff42c110d 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -934,7 +934,7 @@ e_app_window_name_class_title_role_find(const char *name, const char *class,
      }
    if ((a_match) && (l_match))
      {
-	_e_apps_list = evas_list_remove_list(_e_apps_list, l);
+	_e_apps_list = evas_list_remove_list(_e_apps_list, l_match);
 	_e_apps_list = evas_list_prepend(_e_apps_list, a_match);
      }
    return a_match;
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index d8006e5a8..cbc324398 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -73,7 +73,12 @@ e_object_free(E_Object *obj)
      }
  */
    if (obj->free_att_func) obj->free_att_func(obj);
-   obj->magic = E_OBJECT_MAGIC_FREED;
+// FIXME: although this is good - if during cleanup the cleanup func calls
+// other generic funcs to do cleanups on the same object... we get bitching.
+// disable for now (the final free of the struct should probably happen after
+// the cleanup func and be done byt he object system - set the magic after
+// cleanup :)  
+//   obj->magic = E_OBJECT_MAGIC_FREED;
    obj->cleanup_func(obj);
 }