diff --git a/SparkleShare/Mac/SparkleController.cs b/SparkleShare/Mac/SparkleController.cs
index 82f52483..4bc7ce0b 100755
--- a/SparkleShare/Mac/SparkleController.cs
+++ b/SparkleShare/Mac/SparkleController.cs
@@ -214,7 +214,6 @@ namespace SparkleShare {
         new public void Quit ()
         {
             this.watcher.Dispose ();
-            NSApplication.SharedApplication.Terminate (new NSObject ());
             base.Quit ();
         }
 	}
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 74592426..e5bbb9bd 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -213,7 +213,7 @@ namespace SparkleShare {
 
                         // Update the address field text when the selection changes
                         tree.CursorChanged += delegate (object sender, EventArgs e) {
-                            Controller.SelectedPluginChanged ((sender as TreeView).SelectedRow);
+                            Controller.SelectedPluginChanged (tree.SelectedRow);
 
                             // TODO: Scroll to selected row when using arrow keys
                         };