diff --git a/ecdb/trunk/src/ecdb.c b/ecdb/trunk/src/ecdb.c
index 2689fc5..a545173 100644
--- a/ecdb/trunk/src/ecdb.c
+++ b/ecdb/trunk/src/ecdb.c
@@ -157,8 +157,8 @@ SHUTDOWN:
    ecore_shutdown();
    edje_shutdown();
    efreet_shutdown();
-   eina_shutdown();
    ewl_shutdown();
+   eina_shutdown();
 
    printf("Program Done\n");
    return ret;
diff --git a/ecdb/trunk/src/ecdb_filelist_custom.c b/ecdb/trunk/src/ecdb_filelist_custom.c
index d124125..6e8aa6d 100644
--- a/ecdb/trunk/src/ecdb_filelist_custom.c
+++ b/ecdb/trunk/src/ecdb_filelist_custom.c
@@ -25,6 +25,12 @@ ecdb_custom_filelist_new(void)
    Ewl_Widget *ret;
 
    ret = ewl_filelist_new();
+   if (!ret)
+   {
+      printf("ecdb_custom_filelist_new: NULL return!\n");
+      return NULL;
+   }
+
    ewl_model_data_unref_set(EWL_FILELIST(ret)->model,
                                     ecdb_custom_filelist_model_data_unref);
    ewl_model_data_fetch_set(EWL_FILELIST(ret)->model,
diff --git a/ecdb/trunk/src/ecdb_gui.c b/ecdb/trunk/src/ecdb_gui.c
index 627b8a8..b82b87c 100644
--- a/ecdb/trunk/src/ecdb_gui.c
+++ b/ecdb/trunk/src/ecdb_gui.c
@@ -183,6 +183,9 @@ ecdb_create_main_gui(void)
    Evas_Object *gui;
    Evas_Coord mw, mh;
 
+   /* This would be wonderful, but its a bit glitchy
+   em->main_win_ee = ecore_evas_gl_x11_new(0, 0, 0, 0, 255, 255);
+   */
    em->main_win_ee = ecore_evas_software_x11_new(0, 0, 0, 0, 255, 255);
 
    if (!em->main_win_ee)