diff --git a/src/main.cpp b/src/main.cpp
index 5c9e110a2..232a65489 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -115,10 +115,12 @@ int main(int argc, char *argv[]) {
     return 1;
 
   if (a.isRunning()) {
-    if (options.is_empty())
+    if (options.is_empty()) {
       qDebug() << "Clementine is already running - activating existing window";
-    if (a.sendMessage(options.Serialize()))
+    }
+    if (a.sendMessage(options.Serialize())) {
       return 0;
+    }
     // Couldn't send the message so start anyway
   }
 
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 698f80da6..2cc79bf78 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -133,7 +133,7 @@ void SettingsDialog::accept() {
 #endif
 
   // Notifications
-  OSD::Behaviour osd_behaviour;
+  OSD::Behaviour osd_behaviour = OSD::Disabled;
   if      (ui_.notifications_none->isChecked())   osd_behaviour = OSD::Disabled;
   else if (ui_.notifications_native->isChecked()) osd_behaviour = OSD::Native;
   else if (ui_.notifications_tray->isChecked())   osd_behaviour = OSD::TrayPopup;