diff --git a/libbaul-private/baul-directory-async.c b/libbaul-private/baul-directory-async.c
index da1fa03..2ea8ba9 100644
--- a/libbaul-private/baul-directory-async.c
+++ b/libbaul-private/baul-directory-async.c
@@ -3832,7 +3832,8 @@ static gboolean is_trusted_system_desktop_file (GFile *file)
         return FALSE;
     }
 
-    target = g_file_info_get_symlink_target (info);
+    target = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET);
+
     if (!target) {
         goto done;
     }
diff --git a/libbaul-private/baul-file.c b/libbaul-private/baul-file.c
index 82e29a1..b982757 100644
--- a/libbaul-private/baul-file.c
+++ b/libbaul-private/baul-file.c
@@ -2399,7 +2399,8 @@ update_info_internal (BaulFile *file,
 	}
 	file->details->size_on_disk = size_on_disk;
 
-	sort_order = g_file_info_get_sort_order (info);
+	sort_order = g_file_info_get_attribute_int32 (info, G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER);
+
 	if (file->details->sort_order != sort_order) {
 		changed = TRUE;
 	}
@@ -2451,7 +2452,8 @@ update_info_internal (BaulFile *file,
 		file->details->thumbnailing_failed = thumbnailing_failed;
 	}
 
-	symlink_name = g_file_info_get_symlink_target (info);
+	symlink_name = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET);
+
 	if (eel_strcmp (file->details->symlink_name, symlink_name) != 0) {
 		changed = TRUE;
 		g_free (file->details->symlink_name);