diff --git a/SparkleShare/Mac/SparkleWindow.cs b/SparkleShare/Mac/SparkleWindow.cs
index 671a6422..742befb2 100644
--- a/SparkleShare/Mac/SparkleWindow.cs
+++ b/SparkleShare/Mac/SparkleWindow.cs
@@ -42,8 +42,6 @@ namespace SparkleShare {
 		
 		public SparkleWindow () : base ()
 		{
-			
-//			Title = "SparkleShare Configuration";
 
 			SetFrame (new RectangleF (0, 0, 640, 380), true);
 			
@@ -71,15 +69,17 @@ namespace SparkleShare {
 			Buttons = new List <NSButton> ();
 
 			
-			HeaderTextField = new NSTextField (new RectangleF (190, Frame.Height - 100, 318, 48)) {
+			HeaderTextField = new NSTextField () {
+				Frame           = new RectangleF (190, Frame.Height - 100, 318, 48),
 				BackgroundColor = NSColor.WindowBackground,
-				Bordered    = false,
-				Editable    = false,
-				Font        = NSFontManager.SharedFontManager.FontWithFamily
+				Bordered        = false,
+				Editable        = false,
+				Font            = NSFontManager.SharedFontManager.FontWithFamily
 					("Lucida Grande", NSFontTraitMask.Bold, 0, 15)
 			};
 			
-			DescriptionTextField = new NSTextField (new RectangleF (190, Frame.Height - 155 , 640 - 240, 64)) {
+			DescriptionTextField = new NSTextField () {
+				Frame           = new RectangleF (190, Frame.Height - 155 , 640 - 240, 64),
 				BackgroundColor = NSColor.WindowBackground,
 				Bordered        = false,
 				Editable        = false,
@@ -89,6 +89,8 @@ namespace SparkleShare {
 			
 			NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
 			MakeKeyAndOrderFront (this);
+			
+			NSApplication.SharedApplication.AddWindowsItem (this, "SparkleShare Setup", false);
 
 		}
 
@@ -147,6 +149,7 @@ namespace SparkleShare {
 		{
 		
 			OrderOut (this);
+			NSApplication.SharedApplication.RemoveWindowsItem (this);
 			return;
 			
 		}
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 4c37b900..0ff15c4c 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -840,7 +840,7 @@ namespace SparkleShare {
 		private void WriteUserInfo (string user_name, string user_email)
 		{
 			
-			string global_config_file_path = SparkleHelpers.CombineMore (SparklePaths.SparkleConfigPath, "config");
+			string global_config_file_path = Path.Combine (SparklePaths.SparkleConfigPath, "config");
 
 			// Write the user's information to a text file
 			TextWriter writer = new StreamWriter (global_config_file_path);