diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp
index 9ca37a464..f974f0e4e 100644
--- a/linphone-app/src/components/core/CoreManager.cpp
+++ b/linphone-app/src/components/core/CoreManager.cpp
@@ -145,13 +145,15 @@ void CoreManager::init (QObject *parent, const QString &configPath) {
 
 void CoreManager::uninit () {
 	if (mInstance) {
+		mInstance->stopIterate();
+		auto core = mInstance->mCore;
 		mInstance->lockVideoRender();// Stop do iterations. We have to protect GUI.
-		mInstance->mCore->stop();// This is a synchronized stop.
 		mInstance->unlockVideoRender();
-		if( mInstance->mCore->getGlobalState() != linphone::GlobalState::Off)
-			qWarning() << "Core is not off after stopping it. It may result to have multiple core instance.";
-		delete mInstance;
+		delete mInstance;	// This will also remove stored Linphone objects.
 		mInstance = nullptr;
+		core->stop();
+		if( core->getGlobalState() != linphone::GlobalState::Off)
+			qWarning() << "Core is not off after stopping it. It may result to have multiple core instance.";
 	}
 }
 
diff --git a/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
index cdf207d94..0ddea681e 100644
--- a/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
+++ b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
@@ -46,15 +46,17 @@ Row {
 		SmallButton {
 			capitalization: item.capitalization
 			anchors.verticalCenter: parent.verticalCenter
-			backgroundColor: selectedButton === index
-							 ? item.style.button.color.selected
-							 : (down
-								? item.style.button.color.pressed
-								: (hovered
-								   ? item.style.button.color.hovered
-								   : item.style.button.color.normal
-								   )
-								)
+			backgroundColor: item.style
+								? selectedButton === index
+									? item.style.button.color.selected
+									: (down
+										? item.style.button.color.pressed
+										: (hovered
+											? item.style.button.color.hovered
+											: item.style.button.color.normal
+										)
+									)
+								: ''
 			text: modelData
 			radius: height/2
 			
diff --git a/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
index edf835a2d..550624f3a 100644
--- a/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
+++ b/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
@@ -14,7 +14,7 @@ Rectangle {
   
   property QtObject textFieldStyle : TextFieldStyle.normal
 
-  color: textFieldStyle ? textFieldStyle.background.color.normal : undefined
+  color: textFieldStyle ? textFieldStyle.background.color.normal : ''
   radius: textFieldStyle ? textFieldStyle.background.radius : 0
 
   Item {
@@ -27,7 +27,7 @@ Rectangle {
     anchors.fill: parent
 
     border {
-      color: textFieldStyle ? textFieldStyle.background.border.color.normal : undefined
+      color: textFieldStyle ? textFieldStyle.background.border.color.normal : ''
       width: textFieldStyle ? textFieldStyle.background.border.width : 0
     }
 
@@ -37,7 +37,7 @@ Rectangle {
 
   Rectangle {
     anchors.fill: parent
-    color: textFieldStyle ? textFieldStyle.background.color.readOnly : undefined
+    color: textFieldStyle ? textFieldStyle.background.color.readOnly : ''
     opacity: 0.8
     visible: field.readOnly
   }