diff --git a/src/bin/e_error.c b/src/bin/e_error.c
index 1dce0707f..661e16e20 100644
--- a/src/bin/e_error.c
+++ b/src/bin/e_error.c
@@ -242,9 +242,10 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
 
 	edje_object_part_text_set(o, "title", title);
 
-	snprintf(format, sizeof(format), "source='%s' font='%s' size=%d wrap=word",
-					 e_path_find(path_themes, "default.eet"),
-					 "fonts/Edje Vera", 10);
+	snprintf(format, sizeof(format), 
+		 "source='%s' font='%s' size=%d wrap=word",
+		 e_path_find(path_themes, "default.eet"),
+		 "fonts/Edje Vera", 10);
 	text = evas_object_textblock_add(e);
 	evas_object_color_set(text, 0, 0, 0, 255);
 	evas_object_textblock_format_insert(text, format);
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index ae56754c2..fb6655886 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -49,38 +49,32 @@ e_init_init(void)
    e_pointer_ecore_evas_set(_e_init_ecore_evas);
    ecore_evas_raise(_e_init_ecore_evas);
    ecore_evas_show(_e_init_ecore_evas);
-   
+
    screens = (Evas_List *)e_xinerama_screens_get();
    for (l = screens; l; l = l->next)
      {
 	E_Screen *scr;
 	
 	scr = l->data;
+	o = edje_object_add(_e_init_evas);
 	/* first screen */
 	if (l == screens)
 	  {
-	     o = edje_object_add(_e_init_evas);
 	     edje_object_file_set(o,
 				  /* FIXME: "init.eet" needs to come from config */
 				  e_path_find(path_init, "init.eet"),
 				  "init/splash");
-	     evas_object_move(o, scr->x, scr->y);
-	     evas_object_resize(o, scr->w, scr->h);
-	     evas_object_show(o);
 	     _e_init_object = o;
 	  }
 	/* other screens */
 	else
-	  {
-	     o = edje_object_add(_e_init_evas);
-	     edje_object_file_set(o,
-				  /* FIXME: "init.eet" needs to come from config */
-				  e_path_find(path_init, "init.eet"),
-				  "init/extra_screen");
-	     evas_object_move(o, scr->x, scr->y);
-	     evas_object_resize(o, scr->w, scr->h);
-	     evas_object_show(o);
-	  }
+	  edje_object_file_set(o,
+			       /* FIXME: "init.eet" needs to come from config */
+			       e_path_find(path_init, "init.eet"),
+			       "init/extra_screen");
+	evas_object_move(o, scr->x, scr->y);
+	evas_object_resize(o, scr->w, scr->h);
+	evas_object_show(o);
      }
    
    free(roots);
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index aa77bc7a8..6b047c3f8 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -154,6 +154,13 @@ main(int argc, char **argv)
 	_e_main_shutdown(-1);
      }
    _e_main_shutdown_push(_e_main_x_shutdown);
+   if (!e_xinerama_init())
+     {
+	e_error_message_show("Enlightenment cannot setup xinerama wrapping.\n"
+			     "This should not happen.");
+	_e_main_shutdown(-1);
+     }
+   _e_main_shutdown_push(e_xinerama_shutdown);
    
    ecore_x_grab();
    
@@ -490,7 +497,6 @@ _e_main_screens_init(void)
    Ecore_X_Window *roots;
    int num, i;
 
-   if (!e_xinerama_init()) return 0;
    if (!e_atoms_init()) return 0;
    if (!e_manager_init()) return 0;
    if (!e_container_init()) return 0;
@@ -554,7 +560,6 @@ _e_main_screens_shutdown(void)
    e_container_shutdown();
    e_manager_shutdown();
    e_atoms_shutdown();
-   e_xinerama_shutdown();
    return 1;
 }