diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs
index 1bb38a1d..ff0323eb 100755
--- a/SparkleLib/SparkleListenerTcp.cs
+++ b/SparkleLib/SparkleListenerTcp.cs
@@ -91,7 +91,7 @@ namespace SparkleLib {
                         this.is_connected  = false;
                         this.is_connecting = false;
 
-                        this.socket.Dispose ();
+                        // this.socket.Dispose ();
 
                         OnDisconnected (e.Message);
                         return;
@@ -158,7 +158,7 @@ namespace SparkleLib {
                                 this.is_connected          = false;
                                 this.is_connecting         = false;;
 
-                                this.socket.Dispose ();
+                                // this.socket.Dispose ();
 
                                 OnDisconnected ("Ping timeout");
                                 return;
diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj
index 06ae5097..5958ff3d 100644
--- a/SparkleLib/windows/SparkleLib.csproj
+++ b/SparkleLib/windows/SparkleLib.csproj
@@ -71,12 +71,18 @@
     <Compile Include="..\Git\SparkleRepoGit.cs">
       <Link>SparkleRepoGit.cs</Link>
     </Compile>
+    <Compile Include="..\SparkleAnnouncement.cs">
+      <Link>SparkleAnnouncement.cs</Link>
+    </Compile>
     <Compile Include="..\SparkleConfig.cs">
       <Link>SparkleConfig.cs</Link>
     </Compile>
     <Compile Include="..\SparkleExtensions.cs">
       <Link>SparkleExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\SparkleListenerFactory.cs">
+      <Link>SparkleListenerFactory.cs</Link>
+    </Compile>
     <Compile Include="..\SparkleRepoBase.cs">
       <Link>SparkleRepoBase.cs</Link>
     </Compile>
@@ -93,7 +99,6 @@
     </Compile>
     <Compile Include="..\SparkleFetcherBase.cs" />
     <Compile Include="..\SparkleHelpers.cs" />
-    <Compile Include="..\SparkleOptions.cs" />
     <Compile Include="..\SparkleChangeSet.cs" />
     <Compile Include="..\SparkleListenerBase.cs" />
     <Compile Include="..\SparkleListenerTcp.cs" />
diff --git a/SparkleShare/Windows/Program.cs b/SparkleShare/Windows/Program.cs
index 01e27275..2e43ea4d 100644
--- a/SparkleShare/Windows/Program.cs
+++ b/SparkleShare/Windows/Program.cs
@@ -29,7 +29,6 @@ using Mono.Unix;
 //using Mono.Unix.Native;
 #endif
 using SparkleLib;
-using SparkleLib.Options;
 
 namespace SparkleShare {
 
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index 0631b40a..3fe7bfb3 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -93,6 +93,9 @@
     <Compile Include="..\SparkleInvite.cs">
       <Link>SparkleInvite.cs</Link>
     </Compile>
+    <Compile Include="..\SparkleOptions.cs">
+      <Link>SparkleOptions.cs</Link>
+    </Compile>
     <Compile Include="..\SparklePlugin.cs">
       <Link>SparklePlugin.cs</Link>
     </Compile>