diff --git a/src/eog-application.c b/src/eog-application.c
index 81ea2c8..ad0d900 100644
--- a/src/eog-application.c
+++ b/src/eog-application.c
@@ -253,8 +253,8 @@ eog_application_open_file_list (EogApplication  *application,
 	EogWindow *new_window = NULL;
 
 	if (file_list != NULL)
-		new_window = eog_application_get_file_window (application, 
-						     (GFile *) file_list->data);
+		new_window = eog_application_get_file_window (application,
+							      (GFile *) file_list->data);
 
 	if (new_window != NULL) {
 		gtk_window_present_with_time (GTK_WINDOW (new_window),
diff --git a/src/eog-image.c b/src/eog-image.c
index 1bd671a..1c87b94 100644
--- a/src/eog-image.c
+++ b/src/eog-image.c
@@ -1016,6 +1016,7 @@ eog_image_real_load (EogImage *img,
 	g_free (mime_type);
 
 	while (!priv->cancel_loading) {
+		/* FIXME: make this async */
 		bytes_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
 						  buffer, 
 						  EOG_IMAGE_READ_BUFFER_SIZE, 
diff --git a/src/eog-util.c b/src/eog-util.c
index fda0426..5affec7 100644
--- a/src/eog-util.c
+++ b/src/eog-util.c
@@ -187,17 +187,11 @@ eog_util_string_array_to_list (const gchar **files, gboolean create_uri)
 
 		if (create_uri) {
 			GFile *file;
-			GFile *base;
-			char *current_dir;
 			
-			current_dir = g_get_current_dir ();
-			base = g_file_new_for_path (current_dir);
-			file = g_file_resolve_relative_path (base, files[i]);
+			file = g_file_new_for_commandline_arg (files[i]);
 			str = g_file_get_uri (file);
 			
-			g_free (current_dir);
 			g_object_unref (file);
-			g_object_unref (base);
 		} else {
 			str = g_strdup (files[i]);
 		}
@@ -216,9 +210,7 @@ eog_util_string_array_make_absolute (gchar **files)
 {
 	int i;
 	gchar **abs_files;
-	GFile *base;
 	GFile *file;
-	char *current_dir;
 
 	if (files == NULL)
 		return NULL;
@@ -229,13 +221,9 @@ eog_util_string_array_make_absolute (gchar **files)
 	abs_files = g_new0 (gchar *, size+1);
 	
 	for (i = 0; i < size; i++) {
-		current_dir = g_get_current_dir ();
-		base = g_file_new_for_path (current_dir);
-		file = g_file_resolve_relative_path (base, files[i]);
+		file = g_file_new_for_commandline_arg (files[i]);
 		abs_files[i] = g_file_get_uri (file);
 
-		g_free (current_dir);
-		g_object_unref (base);
 		g_object_unref (file);
 	}
 	
