diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index 2d753d0f..6f48b4cc 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -845,8 +845,10 @@ namespace SparkleShare {
 
         public SparkleLabel (string label, NSTextAlignment alignment)
         {
+            if (!string.IsNullOrEmpty (label))
+                StringValue = label;
+
             Alignment       = alignment;
-            StringValue     = label;
             BackgroundColor = NSColor.WindowBackground;
             Bordered        = false;
             Editable        = false;
diff --git a/SparkleShare/Mac/SparkleSetupWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs
index 95e66ea6..ae29188a 100755
--- a/SparkleShare/Mac/SparkleSetupWindow.cs
+++ b/SparkleShare/Mac/SparkleSetupWindow.cs
@@ -37,6 +37,8 @@ namespace SparkleShare {
         private NSTextField header_text_field, description_text_field;
 
 
+        public SparkleSetupWindow (IntPtr handle) : base (handle) { }
+
         public SparkleSetupWindow () : base ()
         {
             SetFrame (new RectangleF (0, 0, 640, 420), true);
@@ -121,7 +123,7 @@ namespace SparkleShare {
                         button.SizeToFit ();
                         button.Frame = new RectangleF (Frame.Width - 30 - 15 - (105 * (i - 1)) - button.Frame.Width,
                             12, button.Frame.Width + 30, 32);
-                        x += 15;
+                        x += 22;
                     }
 
                     button.Font = SparkleUI.Font;