diff --git a/Makefile.am b/Makefile.am
index 8a112853..3013133f 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,9 @@ DIST_SUBDIRS = $(basedirs) SparkleShare
 
 EXTRA_DIST = \
 	gnome-doc-utils.make \
-	LICENSE
+	LICENSE \
+	TRADEMARK \
+	AUTHORS
 
 DISTCLEANFILES = \
 	intltool-extract        \
diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs
index 5f6b9846..7a0d1936 100755
--- a/SparkleLib/SparkleListenerTcp.cs
+++ b/SparkleLib/SparkleListenerTcp.cs
@@ -105,7 +105,6 @@ namespace SparkleLib {
 
                     // Wait for messages
                     while (this.is_connected) {
-
                         try {
                             // This blocks the thread
                             int i = 0;
@@ -170,9 +169,6 @@ namespace SparkleLib {
                             }
 
                         } catch (ObjectDisposedException) {
-                            this.is_connected  = false;
-                            this.is_connecting = false;
-
                             return;
                         }
 
diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
index 37f59328..2fd3329c 100755
--- a/SparkleShare/Mac/SparkleEventLog.cs
+++ b/SparkleShare/Mac/SparkleEventLog.cs
@@ -251,7 +251,7 @@ namespace SparkleShare {
 	                this.popup_button.AddItem (folder);
 					
 					if (folder.Equals (Controller.SelectedFolder))
-						this.popup_button.SelectItemAtIndex (row);
+						this.popup_button.SelectItem (row);
 					
 					row++;
             	}
@@ -283,7 +283,7 @@ namespace SparkleShare {
                     if (html == null)
                         html = Controller.HTML;
     
-					string pixmaps_path = Path.Combine (
+					string pixmaps_path = "file://" + Path.Combine (
 						NSBundle.MainBundle.ResourcePath, "Pixmaps");
 					
                     html = html.Replace ("<!-- $body-font-family -->", "Lucida Grande");
@@ -298,17 +298,16 @@ namespace SparkleShare {
                     html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
     
                     html = html.Replace ("<!-- $document-added-background-image -->",
-                        pixmaps_path + "/document-added-12.png"));
+                        pixmaps_path + "/document-added-12.png");
     
                     html = html.Replace ("<!-- $document-deleted-background-image -->",
-                        pixmaps_path + "/document-deleted-12.png"));
+                        pixmaps_path + "/document-deleted-12.png");
     
                     html = html.Replace ("<!-- $document-edited-background-image -->",
-                        pixmaps_path + "/document-edited-12.png"));
+                        pixmaps_path + "/document-edited-12.png");
     
                     html = html.Replace ("<!-- $document-moved-background-image -->",
-                        pixmaps_path + "/document-moved-12.png"));
-					
+                        pixmaps_path + "/document-moved-12.png");
 					
                     InvokeOnMainThread (delegate {
                         if (this.progress_indicator.Superview == ContentView)