diff --git a/src/bin/edi_content.c b/src/bin/edi_content.c
index d29cc70..77ed46a 100644
--- a/src/bin/edi_content.c
+++ b/src/bin/edi_content.c
@@ -53,7 +53,7 @@ _item_menu_edit_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EI
 static Evas_Object *
 _image_menu_create(const char *path)
 {
-   Elm_Object_Item *menu_it, *menu_it2;
+   Elm_Object_Item *menu_it;
    Evas_Object *menu;
 
    _image_path = path;
@@ -61,9 +61,9 @@ _image_menu_create(const char *path)
    menu = elm_menu_add(edi_main_win_get());
    menu_it = elm_menu_item_add(menu, NULL, "edit", _("Edit with..."), NULL, NULL);
    if (ecore_file_app_installed("gimp"))
-     menu_it2 = elm_menu_item_add(menu, menu_it, "gimp", _("Gimp"), _item_menu_edit_cb, "gimp");
+     elm_menu_item_add(menu, menu_it, "gimp", _("Gimp"), _item_menu_edit_cb, "gimp");
    if (ecore_file_app_installed("inkscape"))
-     menu_it2 = elm_menu_item_add(menu, menu_it, "inkscape", _("Inkscape"), _item_menu_edit_cb, "inkscape");
+     elm_menu_item_add(menu, menu_it, "inkscape", _("Inkscape"), _item_menu_edit_cb, "inkscape");
 
    return menu;
 }
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 31b0967..ad5fbbc 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -1197,7 +1197,7 @@ static void
 _edi_menu_scm_commit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                         void *event_info EINA_UNUSED)
 {
-   char *workdir = getcwd(NULL, PATH_MAX);
+   char *workdir = getcwd(NULL, 0);
 
    if (!_edi_project_credentials_check())
      {
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index aed5ec5..c5c97b6 100644
--- a/src/lib/edi_scm.c
+++ b/src/lib/edi_scm.c
@@ -25,7 +25,7 @@ _edi_scm_exec(const char *command)
 
    if (!self) return -1;
 
-   oldpwd = getcwd(NULL, PATH_MAX);
+   oldpwd = getcwd(NULL, 0);
 
    chdir(self->root_directory);
    code = edi_exe_wait(command);
@@ -44,7 +44,7 @@ _edi_scm_exec_response(const char *command)
 
    if (!self) return NULL;
 
-   oldpwd = getcwd(NULL, PATH_MAX);
+   oldpwd = getcwd(NULL, 0);
 
    chdir(self->root_directory);
    response = edi_exe_response(command);
@@ -61,7 +61,7 @@ edi_scm_git_new(void)
    int code;
    char *oldpwd;
 
-   oldpwd = getcwd(NULL, PATH_MAX);
+   oldpwd = getcwd(NULL, 0);
 
    chdir(edi_project_get());
    code = edi_exe_wait("git init .");
@@ -95,7 +95,7 @@ edi_scm_git_update(const char *dir)
    char *oldpwd;
    int code;
 
-   oldpwd = getcwd(NULL, PATH_MAX);
+   oldpwd = getcwd(NULL, 0);
 
    chdir(dir);
    code = edi_exe_wait("git fetch origin && git reset --hard origin/master");
@@ -921,7 +921,7 @@ edi_scm_init(void)
    if (edi_project_get())
      return edi_scm_init_path(edi_project_get());
 
-   cwd = getcwd(NULL, PATH_MAX);
+   cwd = getcwd(NULL, 0);
    engine = edi_scm_init_path(cwd);
    free(cwd);
    return engine;