diff --git a/configure.ac b/configure.ac
index cf71ebf..a78d3f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ have_po="yes"
 ],[
 have_po="no"
 ])
-AC_SUBST(LTLLIBINTL)
+AC_SUBST([LTLLIBINTL])
 if test "x$LIBINTL" = "x"; then
   LIBINTL="$INTLLIBS"
 fi
diff --git a/src/bin/ephoto.c b/src/bin/ephoto.c
index dff68ae..6d21161 100644
--- a/src/bin/ephoto.c
+++ b/src/bin/ephoto.c
@@ -2,7 +2,7 @@
 
 static void _ephoto_display_usage(void);
 
-EAPI int
+EAPI_MAIN int
 elm_main(int argc, char **argv)
 {
    int r = 0;
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index d587c62..210d879 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -29,10 +29,11 @@
 # endif
 
 #if HAVE_GETTEXT && ENABLE_NLS
-#define _(string) gettext (string)
+# include <libintl.h>
+# define _(string) gettext (string)
 #else
-#define _(string) (string)
-#define ngettext(String1, String2, Var) Var == 1 ? String1 : String2
+# define _(string) (string)
+# define ngettext(String1, String2, Var) Var == 1 ? String1 : String2
 #endif
 
 typedef struct _Ephoto_Config Ephoto_Config;
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 7ebea4d..cf0ac51 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -79,7 +79,7 @@ ephoto_config_free(Ephoto *ephoto)
 }
 
 static void
-_close(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_config_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *popup = data;
 
@@ -87,7 +87,7 @@ _close(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_save(void *data, Evas_Object *obj EINA_UNUSED,
+_config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
     void *event_info EINA_UNUSED)
 {
    Evas_Object *popup = data;
@@ -527,7 +527,7 @@ ephoto_config_main(Ephoto *ephoto)
    button = elm_button_add(popup);
    elm_object_text_set(button, _("Save"));
    elm_object_part_content_set(button, "icon", ic);
-   evas_object_smart_callback_add(button, "clicked", _save, popup);
+   evas_object_smart_callback_add(button, "clicked", _config_save_cb, popup);
    elm_object_part_content_set(popup, "button1", button);
    evas_object_show(button);
 
@@ -539,7 +539,7 @@ ephoto_config_main(Ephoto *ephoto)
    button = elm_button_add(popup);
    elm_object_text_set(button, _("Close"));
    elm_object_part_content_set(button, "icon", ic);
-   evas_object_smart_callback_add(button, "clicked", _close, popup);
+   evas_object_smart_callback_add(button, "clicked", _config_close_cb, popup);
    elm_object_part_content_set(popup, "button2", button);
    evas_object_show(button);
 
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 778cfdd..d5f5371 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -640,7 +640,8 @@ _thumb_gen_size_changed_timer_cb(void *data)
      {
         Ethumb_Thumb_Format format;
 
-        format = (long) evas_object_data_get(o, "ephoto_format");
+        format = (Ethumb_Thumb_Format) (uintptr_t) 
+            evas_object_data_get(o, "ephoto_format");
         if (format)
 	  {
 	     elm_thumb_format_set(o, format);
@@ -753,7 +754,7 @@ ephoto_thumb_path_set(Evas_Object *obj, const char *path)
 	  }
      }
    elm_thumb_format_set(obj, format);
-   evas_object_data_set(obj, "ephoto_format", (void *) (long) format);
+   evas_object_data_set(obj, "ephoto_format", (void *) (uintptr_t) format);
    elm_thumb_crop_align_set(obj, 0.5, 0.5);
    elm_thumb_aspect_set(obj, ETHUMB_THUMB_CROP);
    elm_thumb_orientation_set(obj, ETHUMB_THUMB_ORIENT_ORIGINAL);