diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a7f1543fd..e08faa2c8 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -552,8 +552,6 @@ e_border_unshade(E_Border *bd, E_Direction dir)
 void
 e_border_maximize(E_Border *bd)
 {
-   E_Zone *zone;
-
    E_OBJECT_CHECK(bd);
    
    if ((bd->shaded) || (bd->shading)) return;
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 5125ad122..d15808151 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -94,7 +94,7 @@ e_desk_current_get(E_Zone *zone)
 {
    Evas_List *l;
    
-   E_OBJECT_CHECK(zone);
+   E_OBJECT_CHECK_RETURN(zone, NULL);
    
    for (l = zone->desks; l; l = l->next)
      {
diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 8fe1c84b8..724e43c2d 100644
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -23,6 +23,7 @@ EAPI void         e_desk_show(E_Desk *desk);
 EAPI E_Desk      *e_desk_current_get(E_Zone *zone);
 EAPI void         e_desk_next(E_Zone *zone);
 EAPI void         e_desk_prev(E_Zone *zone);
+EAPI void         e_desk_remove(E_Desk *desk);
 
 #endif
 
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 18390d7d0..6d209f58e 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -124,7 +124,6 @@ E_Menu *
 e_int_menus_desktops_new(void)
 {
    E_Menu *m;
-   E_Menu_Item *mi;
 
    m = e_menu_new();
    e_menu_pre_activate_callback_set(m, _e_int_menus_desktops_pre_cb, NULL);
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index 24a0104da..280878dbe 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -75,7 +75,7 @@ e_object_free(E_Object *obj)
 int
 e_object_ref(E_Object *obj)
 {
-   E_OBJECT_CHECK(obj);
+   E_OBJECT_CHECK_RETURN(obj, -1);
    obj->references++;
    return obj->references;
 }
@@ -85,7 +85,7 @@ e_object_unref(E_Object *obj)
 {
    int ref;
    
-   E_OBJECT_CHECK(obj);
+   E_OBJECT_CHECK_RETURN(obj, -1);
    obj->references--;
    ref = obj->references;
    if (obj->references <= 0) e_object_free(obj);
diff --git a/src/bin/e_object.h b/src/bin/e_object.h
index b6866e27e..6e591c4c7 100644
--- a/src/bin/e_object.h
+++ b/src/bin/e_object.h
@@ -10,8 +10,8 @@
 /* OBJECT_CHECK is a simple null pointer and magic number check with no */
 /* debug output */
 
-//#define OBJECT_PARANOIA_CHECK
-//#define OBJECT_CHECK
+/* #define OBJECT_PARANOIA_CHECK
+#define OBJECT_CHECK */
 
 #ifndef __GLIBC__
 # ifdef OBJECT_PARANOIA_CHECK
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 1e6a4c75a..ca6d355d3 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -140,7 +140,7 @@ e_zone_current_get(E_Container *con)
 {
    Evas_List *l;
 
-   E_OBJECT_CHECK(con);
+   E_OBJECT_CHECK_RETURN(con, NULL);
    l = con->zones;
    /* FIXME: Should return the zone the pointer is currently in */
    return (E_Zone *)l->data;
@@ -164,7 +164,7 @@ e_zone_bg_reconfigure(E_Zone *zone)
 Evas_List *
 e_zone_clients_list_get(E_Zone *zone)
 {
-    E_OBJECT_CHECK(zone);
+    E_OBJECT_CHECK_RETURN(zone, NULL);
     return zone->clients;
 }