Index: src/lib/elm_config.c
===================================================================
--- src/lib/elm_config.c	(revision 63444)
+++ src/lib/elm_config.c	(working copy)
@@ -913,10 +913,9 @@
              continue;
           }
      }
+   eina_iterator_free(file_it);
    return flist;
 
-   eina_iterator_free(file_it);
-
 list_free:
    EINA_LIST_FREE(flist, dir)
      eina_stringshare_del(dir);
Index: src/lib/elm_widget.c
===================================================================
--- src/lib/elm_widget.c	(revision 63444)
+++ src/lib/elm_widget.c	(working copy)
@@ -1790,7 +1790,7 @@
              break;
           }
      }
-   sd->callback_del_func(obj, emission, source, _edje_signal_callback, esd);
+   sd->callback_del_func(obj, emission, source, _edje_signal_callback, data);
    return data;
 }
 
Index: src/edje_externals/elm_genlist.c
===================================================================
--- src/edje_externals/elm_genlist.c	(revision 63444)
+++ src/edje_externals/elm_genlist.c	(working copy)
@@ -31,7 +31,7 @@
 
    assert(sizeof(list_horizontal_choices)/sizeof(list_horizontal_choices[0]) == ELM_LIST_LAST + 1);
 
-   for (i = 0; i < sizeof(list_horizontal_choices); i++)
+   for (i = 0; i < ELM_LIST_LAST; i++)
      {
 	if (!strcmp(horizontal_str, list_horizontal_choices[i]))
 	  return i;
Index: src/edje_externals/elm_notify.c
===================================================================
--- src/edje_externals/elm_notify.c	(revision 63444)
+++ src/edje_externals/elm_notify.c	(working copy)
@@ -36,7 +36,7 @@
    assert(sizeof(orients)/sizeof(orients[0]) ==
 	  ELM_NOTIFY_ORIENT_LAST + 1);
 
-   for (i = 0; i < sizeof(orients); i++)
+   for (i = 0; i < ELM_NOTIFY_ORIENT_LAST; i++)
      if (!strcmp(orient, orients[i])) return i;
 
    return ELM_NOTIFY_ORIENT_LAST;
Index: src/edje_externals/elm_list.c
===================================================================
--- src/edje_externals/elm_list.c	(revision 63444)
+++ src/edje_externals/elm_list.c	(working copy)
@@ -18,7 +18,7 @@
 
 #define CHOICE_GET(CHOICES, STR)                \
   unsigned int i;                               \
-  for (i = 0; i < sizeof(CHOICES); i++)         \
+  for (i = 0; i < (sizeof(CHOICES)/sizeof(CHOICES[0])); i++)         \
     if (strcmp(STR, CHOICES[i]) == 0)           \
       return i
 
Index: src/edje_externals/elm_thumb.c
===================================================================
--- src/edje_externals/elm_thumb.c	(revision 63444)
+++ src/edje_externals/elm_thumb.c	(working copy)
@@ -17,7 +17,7 @@
 
    assert(sizeof(choices)/sizeof(choices[0]) == ELM_THUMB_ANIMATION_LAST + 1);
 
-   for (i = 0; i < sizeof(choices); i++)
+   for (i = 0; i < ELM_THUMB_ANIMATION_LAST; i++)
      {
 	if (!strcmp(anim_str, choices[i]))
 	  return i;
Index: src/edje_externals/elm_map.c
===================================================================
--- src/edje_externals/elm_map.c	(revision 63444)
+++ src/edje_externals/elm_map.c	(working copy)
@@ -24,7 +24,7 @@
    assert(sizeof(zoom_choices)/sizeof(zoom_choices[0]) ==
 	  ELM_MAP_ZOOM_MODE_LAST + 1);
 
-   for (i = 0; i < sizeof(zoom_choices); i++)
+   for (i = 0; i < ELM_MAP_ZOOM_MODE_LAST; i++)
      if (!strcmp(map_src, zoom_choices[i])) return i;
 
    return ELM_MAP_ZOOM_MODE_LAST;