diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 1ba9e45..304ee5b 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -8,10 +8,12 @@
 #include <Evas.h>
 #include <Ewl.h>
 #include <fnmatch.h>
+
 #ifdef BUILD_EXIF_SUPPORT
 #include <libexif/exif-data.h>
 #include <libexif/exif-loader.h>
 #endif
+
 #include <libgen.h>
 #include <limits.h>
 #include <sqlite3.h>
diff --git a/src/bin/ephoto_list_view.c b/src/bin/ephoto_list_view.c
index ce39c39..4b636a0 100644
--- a/src/bin/ephoto_list_view.c
+++ b/src/bin/ephoto_list_view.c
@@ -49,8 +49,8 @@ Ewl_Widget *add_ltree(Ewl_Widget *c)
 	Ewl_View *view;
 
 	model = ewl_model_new();
-	ewl_model_fetch_set(model, list_data_fetch);
-	ewl_model_count_set(model, list_data_count);
+	ewl_model_data_fetch_set(model, list_data_fetch);
+	ewl_model_data_count_set(model, list_data_count);
 
 	tree = ewl_tree2_new();
 	ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 29cb3a2..d94b5e0 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -143,6 +143,7 @@ void create_main_gui(void)
         button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/get_exif.png", NULL, NULL);
         ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30);
 	ewl_attach_tooltip_text_set(button, "You do not have libexif 0.6.13");
+
 #ifdef BUILD_EXIF_SUPPORT
 	ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, NULL);
 	ewl_attach_tooltip_text_set(button, "View Exif Data");
@@ -233,8 +234,8 @@ static Ewl_Widget *add_atree(Ewl_Widget *c)
 	Ewl_View *view;
 
 	model = ewl_model_new();
-	ewl_model_fetch_set(model, album_data_fetch);
-	ewl_model_count_set(model, album_data_count);
+	ewl_model_data_fetch_set(model, album_data_fetch);
+	ewl_model_data_count_set(model, album_data_count);
 
 	tree = ewl_tree2_new();
 	ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);