diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index bac49759..e254e0ef 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -299,7 +299,7 @@ namespace SparkleLib {
         // Starts a timer when something changes
         public void OnFileActivity (object o, FileSystemEventArgs args)
         {
-            if (args.FullPath.Contains ("/."))
+            if (args.FullPath.Contains (Path.DirectorySeparatorChar + "."))
                 return;
 
             WatcherChangeTypes wct = args.ChangeType;
diff --git a/SparkleShare/Windows/SparkleWinController.cs b/SparkleShare/Windows/SparkleWinController.cs
index 89ff239b..cac120ca 100644
--- a/SparkleShare/Windows/SparkleWinController.cs
+++ b/SparkleShare/Windows/SparkleWinController.cs
@@ -46,10 +46,11 @@ namespace SparkleShare {
 			               + System.Environment.ExpandEnvironmentVariables ("%PATH%");
 			System.Environment.SetEnvironmentVariable ("PATH", newPath);
 			System.Environment.SetEnvironmentVariable ("PLINK_PROTOCOL", "ssh");
-			System.Environment.SetEnvironmentVariable ("HOME", Environment.ExpandEnvironmentVariables ("%HOMEDRIVE%%HOMEPATH%"));
+
+			if (String.IsNullOrEmpty (System.Environment.GetEnvironmentVariable ("HOME")))
+				System.Environment.SetEnvironmentVariable ("HOME", Environment.ExpandEnvironmentVariables ("%HOMEDRIVE%%HOMEPATH%"));
 
 			StartSshAgent ();
-			AddDefaultKey ();
 
 			base.Initialize ();
 		}
@@ -103,17 +104,6 @@ namespace SparkleShare {
 			process.Start();
 		}
 
-		public void AddDefaultKey ()
-		{
-			/*Process process = new Process ();
-			process.StartInfo.RedirectStandardOutput = true;
-			process.StartInfo.UseShellExecute = false;
-			process.StartInfo.FileName = "ssh-add";
-			process.StartInfo.Arguments = @"~/.ssh/id_rsa";
-			process.Start ();
-			process.WaitForExit ();*/
-		}
-
 		private void StartSshAgent ()
 		{
 			if (String.IsNullOrEmpty (System.Environment.GetEnvironmentVariable ("SSH_AUTH_SOCK"))) {