diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d86745a8b9..c02ac4ceb3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7110,9 +7110,9 @@ void Application::updateWindowTitle() const {
     QString currentPlaceName;
     if (isServerlessMode()) {
         if (isInErrorState) {
-            currentPlaceName = "serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
+            currentPlaceName = "Serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
         } else {
-            currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
+            currentPlaceName = "Serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
         }
     } else {
         currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host();
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 4e8c88560b..8d96a2e6b5 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -2072,7 +2072,6 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
     // NOTE: device start() uses the Qt internal device list
     Lock lock(_deviceMutex);
 
-    Lock localAudioLock(_localAudioMutex);
     _localSamplesAvailable.exchange(0, std::memory_order_release);
 
     //wait on local injectors prep to finish running
@@ -2080,6 +2079,8 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
         _localPrepInjectorFuture.waitForFinished();
     }
 
+    Lock localAudioLock(_localAudioMutex);
+
     // cleanup any previously initialized device
     if (_audioOutput) {
         _audioOutputIODevice.close();
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 38e7ad9c3a..cd27c1cf36 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -746,6 +746,10 @@ QString ModelEntityItem::getBlendshapeCoefficients() const {
 }
 
 void ModelEntityItem::setBlendshapeCoefficients(const QString& blendshapeCoefficients) {
+    if (blendshapeCoefficients.isEmpty()) {
+        return;
+    }
+
     QJsonParseError error;
     QJsonDocument newCoefficientsJSON = QJsonDocument::fromJson(blendshapeCoefficients.toUtf8(), &error);
     if (error.error != QJsonParseError::NoError) {