diff --git a/src/audio.cpp b/src/audio.cpp
index 28c07e26f..dc93aff21 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -156,7 +156,9 @@ void Audio::openInput(const QString& inDevDescr)
     else
         qDebug() << "Opening audio input "<<inDevDescr;
 
-    Core::getInstance()->resetCallSources(); // Force to regen each group call's sources
+    Core* core = Core::getInstance();
+    if (core)
+        core->resetCallSources(); // Force to regen each group call's sources
 
     // Restart the capture if necessary
     if (userCount.load() != 0 && alInDev)
@@ -210,7 +212,9 @@ void Audio::openOutput(const QString& outDevDescr)
         qDebug() << "Opening audio output " + outDevDescr;
     }
 
-    Core::getInstance()->resetCallSources(); // Force to regen each group call's sources
+    Core* core = Core::getInstance();
+    if (core)
+        core->resetCallSources(); // Force to regen each group call's sources
 }
 
 void Audio::closeInput()
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index c033ff1d5..03ef1bf79 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -50,7 +50,7 @@
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)
-    , callId(0)
+    , callId{0}, isTyping{false}
 {
     nameLabel->setText(f->getDisplayedName());