diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 65d7d9ca..741d014d 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -564,16 +564,6 @@ namespace SparkleLib {
         }
 
 
-        public override void CreateInitialChangeSet ()
-        {
-            base.CreateInitialChangeSet ();
-            Add ();
-
-            string message = FormatCommitMessage ();
-            Commit (message);
-        }
-
-
         public override void AddNote (string revision, string note)
         {
             int timestamp = (int) (DateTime.UtcNow - new DateTime (1970, 1, 1)).TotalSeconds;
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index dde4c277..fd8c4746 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -86,12 +86,11 @@ namespace SparkleLib {
                 this.status = status;
             };
 
-            if (CurrentRevision == null) {
-                CreateInitialChangeSet ();
-                HasUnsyncedChanges = true;
-            }
-
             CreateWatcher ();
+
+            if (CurrentRevision == null)
+                CreateInitialChangeSet ();
+
             CreateListener ();
 
             this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) {
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index e8558244..5ecf6d64 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -899,6 +899,9 @@ namespace SparkleShare {
 
         public void FetchFolder (string server, string remote_folder)
         {
+            server = server.Trim ();
+            remote_folder = remote_folder.Trim ();
+
             if (!Directory.Exists (SparklePaths.SparkleTmpPath))
                 Directory.CreateDirectory (SparklePaths.SparkleTmpPath);