diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index f1636650ed..8b7d692850 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -4,7 +4,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(ecore, 0.9.9.037)
+AM_INIT_AUTOMAKE(ecore, 0.9.9.038)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index ff959e547f..b548c69843 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -7,7 +7,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(edje, 0.5.0.037)
+AM_INIT_AUTOMAKE(edje, 0.5.0.038)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/legacy/edje/src/lib/edje_message_queue.c b/legacy/edje/src/lib/edje_message_queue.c
index 8d1440e461..dde7b4998c 100644
--- a/legacy/edje/src/lib/edje_message_queue.c
+++ b/legacy/edje/src/lib/edje_message_queue.c
@@ -69,6 +69,7 @@ edje_object_message_signal_process(Evas_Object *obj)
 	
 	em = tmp_msgq->data;
 	tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq);
+	em->edje->message.num--;
 	_edje_message_process(em);
 	_edje_message_free(em);
      }
@@ -251,7 +252,6 @@ _edje_message_free(Edje_Message *em)
 	     break;
 	  }
      }
-   em->edje->message.num--;
    free(em);
 }
 
@@ -580,7 +580,7 @@ _edje_message_queue_process(void)
 	     tmp_msgq = msgq;
 	     msgq = NULL;
 	  }
-	
+
 	while (tmp_msgq)
 	  {
 	     Edje_Message *em;
@@ -588,11 +588,17 @@ _edje_message_queue_process(void)
 	     
 	     em = tmp_msgq->data;
 	     ed = em->edje;
-	     ed->processing_messages++;
 	     tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq);
-	     _edje_message_process(em);
-	     _edje_message_free(em);
-	     ed->processing_messages--;
+	     em->edje->message.num--;
+	     if (!ed->delete_me)
+	       {
+		  ed->processing_messages++;
+		  _edje_message_process(em);
+		  _edje_message_free(em);
+		  ed->processing_messages--;
+	       }
+	     else
+	       _edje_message_free(em);
 	     if (ed->processing_messages == 0)
 	       {
 		  if (ed->delete_me) _edje_del(ed);
@@ -615,6 +621,7 @@ _edje_message_queue_clear(void)
 	
 	em = msgq->data;
 	msgq = evas_list_remove_list(msgq, msgq);
+	em->edje->message.num--;
 	_edje_message_free(em);
      }
    while (tmp_msgq)
@@ -623,6 +630,7 @@ _edje_message_queue_clear(void)
 	
 	em = tmp_msgq->data;
 	tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq);
+	em->edje->message.num--;
 	_edje_message_free(em);
      }
 }
@@ -645,6 +653,7 @@ _edje_message_del(Edje *ed)
 	if (em->edje == ed)
 	  {
 	     msgq = evas_list_remove_list(msgq, lp);
+	     em->edje->message.num--;
 	     _edje_message_free(em);
 	  }
 	if (ed->message.num <= 0) return;
@@ -661,6 +670,7 @@ _edje_message_del(Edje *ed)
 	if (em->edje == ed)
 	  {
 	     tmp_msgq = evas_list_remove_list(tmp_msgq, lp);
+	     em->edje->message.num--;
 	     _edje_message_free(em);
 	  }
 	if (ed->message.num <= 0) return;
diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index c57f365100..c81bffe9db 100644
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -5,7 +5,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(eet, 0.9.10.037)
+AM_INIT_AUTOMAKE(eet, 0.9.10.038)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/legacy/efreet/configure.in b/legacy/efreet/configure.in
index 3ad96e5a14..b7f4567b2b 100644
--- a/legacy/efreet/configure.in
+++ b/legacy/efreet/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(efreet, 0.0.3)
+AM_INIT_AUTOMAKE(efreet, 0.0.3.002)
 AM_CONFIG_HEADER(config.h)
 
 AC_ISC_POSIX
diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in
index 92c0720637..004e3b536d 100644
--- a/legacy/embryo/configure.in
+++ b/legacy/embryo/configure.in
@@ -5,7 +5,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(embryo, 0.9.1.037)
+AM_INIT_AUTOMAKE(embryo, 0.9.1.038)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in
index 9788ed4ab7..93d6efebeb 100644
--- a/legacy/emotion/configure.in
+++ b/legacy/emotion/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 rm -f config.cache
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(emotion, 0.0.1.004)
+AM_INIT_AUTOMAKE(emotion, 0.0.1.005)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index ece9571519..c130fd1a45 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -5,7 +5,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(evas, 0.9.9.037)
+AM_INIT_AUTOMAKE(evas, 0.9.9.038)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index 4db780b293..4523839140 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -18,9 +18,9 @@ evas_shutdown(void)
    initcount--;
    if (initcount == 0)
      {
-	evas_module_shutdown();
 	evas_font_dir_cache_free();
 	evas_common_shutdown();
+	evas_module_shutdown();
      }
    return initcount;
 }