.../tracker/rygel-tracker-item-factory.vala        |    8 ++++----
 .../tracker/rygel-tracker-selection-query.vala     |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/tracker/rygel-tracker-item-factory.vala b/src/plugins/tracker/rygel-tracker-item-factory.vala
index 1a7537c..11ee397 100644
--- a/src/plugins/tracker/rygel-tracker-item-factory.vala
+++ b/src/plugins/tracker/rygel-tracker-item-factory.vala
@@ -44,10 +44,10 @@ public abstract class Rygel.TrackerItemFactory {
 
     public ArrayList<ArrayList<string>> key_chains;
 
-    public TrackerItemFactory (string category,
-                               string upnp_class,
-                               string resources_class_path,
-                               string upload_dir) {
+    public TrackerItemFactory (string  category,
+                               string  upnp_class,
+                               string  resources_class_path,
+                               string? upload_dir) {
         this.category = category;
         this.upnp_class = upnp_class;
         this.resources_class_path = resources_class_path;
diff --git a/src/plugins/tracker/rygel-tracker-selection-query.vala b/src/plugins/tracker/rygel-tracker-selection-query.vala
index 3e9825b..7f562ec 100644
--- a/src/plugins/tracker/rygel-tracker-selection-query.vala
+++ b/src/plugins/tracker/rygel-tracker-selection-query.vala
@@ -57,10 +57,10 @@ public class Rygel.TrackerSelectionQuery : Rygel.TrackerQuery {
     }
 
     public TrackerSelectionQuery.clone (TrackerSelectionQuery query) {
-        this (this.copy_str_list (query.variables),
+        this (copy_str_list (query.variables),
               new TrackerQueryTriplets.clone (query.mandatory),
               new TrackerQueryTriplets.clone (query.optional),
-              this.copy_str_list (query.filters),
+              copy_str_list (query.filters),
               query.order_by,
               query.offset,
               query.max_count);
@@ -111,7 +111,7 @@ public class Rygel.TrackerSelectionQuery : Rygel.TrackerQuery {
         return query;
     }
 
-    private ArrayList<string> copy_str_list (Gee.List<string> str_list) {
+     private static ArrayList<string> copy_str_list (Gee.List<string> str_list) {
         var copy = new ArrayList<string> ();
 
         copy.add_all (str_list);