diff --git a/src/bin/ephoto_browsing.c b/src/bin/ephoto_browsing.c
index f62c7ab..b51a3b9 100644
--- a/src/bin/ephoto_browsing.c
+++ b/src/bin/ephoto_browsing.c
@@ -4,7 +4,7 @@
 Ecore_List *get_directories(const char *directory)
 {
 	Ecore_List *ls, *files;
-	const char *file;
+	char *file;
 	char path[PATH_MAX];
 
 	if (ecore_file_is_dir(directory))
@@ -51,7 +51,7 @@ Ecore_List *get_directories(const char *directory)
 Ecore_List *get_images(const char *directory)
 {
         Ecore_List *ls, *files;
-        const char *file;
+        char *file;
         char path[PATH_MAX];
 
         if (ecore_file_is_dir(directory))
diff --git a/src/bin/ephoto_database.c b/src/bin/ephoto_database.c
index 2ff188d..8f028bf 100644
--- a/src/bin/ephoto_database.c
+++ b/src/bin/ephoto_database.c
@@ -207,7 +207,7 @@ static int list_image_ids(void *notused, int argc, char **argv, char **col)
 Ecore_List *ephoto_db_list_images(sqlite3 *db,  const char *album)
 {
 	char command[PATH_MAX];
-	const char *id;
+	char *id;
 
 	if(images_list)
 	{
diff --git a/src/bin/ephoto_edit_view.c b/src/bin/ephoto_edit_view.c
index 6060786..a2f30d6 100644
--- a/src/bin/ephoto_edit_view.c
+++ b/src/bin/ephoto_edit_view.c
@@ -76,7 +76,7 @@ void add_edit_tools(Ewl_Widget *c)
 /*Go to the previous image*/
 static void previous_image(Ewl_Widget *w, void *event, void *data)
 {
-        const char *image;
+        char *image;
 
         ecore_dlist_previous(em->images);
         image = ecore_dlist_current(em->images);
@@ -95,7 +95,7 @@ static void previous_image(Ewl_Widget *w, void *event, void *data)
 /*Go to the next image*/
 static void next_image(Ewl_Widget *w, void *event, void *data)
 {
-	const char *image;
+	char *image;
 
 	ecore_dlist_next(em->images);
 	image = ecore_dlist_current(em->images);
diff --git a/src/bin/ephoto_exif.c b/src/bin/ephoto_exif.c
index 9dd8d88..4be0379 100644
--- a/src/bin/ephoto_exif.c
+++ b/src/bin/ephoto_exif.c
@@ -7,7 +7,7 @@ static void add_exif_to_container(Ewl_Widget *w, void *event, void *data);
 /*Get the Exif Data for an image and return it in a hash*/
 Ecore_Hash *get_exif_data(const char *file)
 {
-	const char **args, *ifd_name, *title;
+	const char **args, *title;
 	char value[1024];
 	unsigned int i, tag;
 	Ecore_Hash *exif_info;
@@ -94,7 +94,8 @@ static void close_dialog(Ewl_Widget *w, void *event, void *data)
 /*Add all the exif information to the container w*/
 static void add_exif_to_container(Ewl_Widget *w, void *event, void *data)
 {
-	const char *img, *key, *value;
+	const char *img;
+	char *key, *value;
 	char text[PATH_MAX];
 	Ecore_Hash *exif_info;
 	Ecore_List *keys, *values;
@@ -127,8 +128,7 @@ static void add_exif_to_container(Ewl_Widget *w, void *event, void *data)
 	ewl_mvc_data_set(EWL_MVC(w), values);
 	ewl_widget_data_set(win, "list", values);
 	ecore_hash_destroy(exif_info);
-	free(img);
-	
+		
 	return;
 }
 
@@ -187,8 +187,6 @@ void display_exif_dialog(Ewl_Widget *w, void *event, void *data)
 
 	add_button(vbox, "Close", PACKAGE_DATA_DIR "/images/dialog-close.png", close_dialog, win);
 	
-	free(img);
-
 	return;
 }
 
diff --git a/src/bin/ephoto_gui.c b/src/bin/ephoto_gui.c
index f6f61ac..8729188 100644
--- a/src/bin/ephoto_gui.c
+++ b/src/bin/ephoto_gui.c
@@ -30,8 +30,7 @@ Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void *cb
 Ewl_Widget *add_image(Ewl_Widget *c, const char *img, int thumbnail, void *cb, void *data)
 {
 	Ewl_Widget *image;
-	const char *thumb;
-	int w, h, pid;
+	int w, h;
 
 	if(!thumbnail)
 	{
diff --git a/src/bin/ephoto_list_view.c b/src/bin/ephoto_list_view.c
index 1272a6e..2611137 100644
--- a/src/bin/ephoto_list_view.c
+++ b/src/bin/ephoto_list_view.c
@@ -135,7 +135,7 @@ static Ewl_Widget *list_header_fetch(void *data, int column)
 /* The images that will be displayed*/ 
 static void *list_data_fetch(void *data, unsigned int row, unsigned int column)
 {
-	char *image;
+	const char *image;
 	void *val = NULL;
 
 	image = ecore_list_goto_index(em->images, row);
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index ea3ed84..fce0c0d 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -207,7 +207,8 @@ void create_main_gui(void)
 /*Update the Image List*/
 static void populate(Ewl_Widget *w, void *event, void *data)
 {
-	char *album, *imagef;
+	const char *album;
+	char *imagef;
 	Ewl_Widget *shadow, *thumb;
 
 	if (w)
@@ -387,7 +388,7 @@ static Ewl_Widget *album_view_new(void)
 /*The row that is added to the tree*/
 static void album_view_assign(Ewl_Widget *w, void *data)
 {
-	char *album;
+	const char *album;
 
 	album = data;
 	ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/image.png", NULL);
@@ -414,7 +415,7 @@ static Ewl_Widget *album_header_fetch(void *data, int column)
 /* The albums that will be displayed*/ 
 static void *album_data_fetch(void *data, unsigned int row, unsigned int column)
 {
-	char *album;
+	const char *album;
 	void *val = NULL;
 
 	album = ecore_list_goto_index(em->albums, row);
diff --git a/src/bin/ephoto_nls.c b/src/bin/ephoto_nls.c
index 16844e7..df47ad7 100644
--- a/src/bin/ephoto_nls.c
+++ b/src/bin/ephoto_nls.c
@@ -4,7 +4,9 @@
 /*NLS Translator*/
 char *sgettext(const char *msgid)
 {
-	char *msgval = gettext(msgid);
+	char *msgval;
+
+	msgval = gettext(msgid);
 	
 	if (msgval == msgid)
 	{