diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index a9dc0874138..a669aad6fc9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -145,7 +145,8 @@ void Qt5NodeInstanceServer::resizeCanvasToRootItem()
 {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     m_viewData.bufferDirty = true;
-    m_viewData.contentItem->setPosition(-m_viewData.rootItem->position());
+    if (m_viewData.contentItem)
+        m_viewData.contentItem->setPosition(-m_viewData.rootItem->position());
 #endif
     quickWindow()->resize(rootNodeInstance().boundingRect().size().toSize());
 }
diff --git a/src/libs/languageserverprotocol/workspace.h b/src/libs/languageserverprotocol/workspace.h
index 8a768e3e544..3b0b247b88b 100644
--- a/src/libs/languageserverprotocol/workspace.h
+++ b/src/libs/languageserverprotocol/workspace.h
@@ -109,7 +109,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationParams : public JsonObject
 {
 public:
     using JsonObject::JsonObject;
-    class ConfigureationItem : public JsonObject
+    class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationItem : public JsonObject
     {
     public:
         using JsonObject::JsonObject;
@@ -125,8 +125,8 @@ public:
         bool isValid() const override { return contains(scopeUriKey); }
     };
 
-    QList<ConfigureationItem> items() const { return array<ConfigureationItem>(itemsKey); }
-    void setItems(const QList<ConfigureationItem> &items) { insertArray(itemsKey, items); }
+    QList<ConfigurationItem> items() const { return array<ConfigurationItem>(itemsKey); }
+    void setItems(const QList<ConfigurationItem> &items) { insertArray(itemsKey, items); }
 
     bool isValid() const override { return contains(itemsKey); }
 };
diff --git a/src/plugins/autotest/gtest/gtestvisitors.cpp b/src/plugins/autotest/gtest/gtestvisitors.cpp
index 9f622acb5b5..b3e36b67ca1 100644
--- a/src/plugins/autotest/gtest/gtestvisitors.cpp
+++ b/src/plugins/autotest/gtest/gtestvisitors.cpp
@@ -94,8 +94,12 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
                 testCaseName.clear();
         }
     } else {
-        const CPlusPlus::Argument *testSuiteNameArg = ast->symbol->argumentAt(0)->asArgument();
-        const CPlusPlus::Argument *testCaseNameArg = ast->symbol->argumentAt(1)->asArgument();
+        const CPlusPlus::Symbol *firstArg = ast->symbol->argumentAt(0);
+        const CPlusPlus::Symbol *secondArg = ast->symbol->argumentAt(1);
+        if (!firstArg || !secondArg)
+            return false;
+        const CPlusPlus::Argument *testSuiteNameArg = firstArg->asArgument();
+        const CPlusPlus::Argument *testCaseNameArg = secondArg->asArgument();
         if (testSuiteNameArg && testCaseNameArg) {
             testSuiteName = m_overview.prettyType(testSuiteNameArg->type());
             testCaseName = m_overview.prettyType(testCaseNameArg->type());
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index 8c5bb5962c7..9fcbda4e802 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -499,15 +499,15 @@ SearchResult *SearchResultWindow::startNewSearch(const QString &label,
                                                  const QString &cfgGroup)
 {
     if (d->m_searchResults.size() >= MAX_SEARCH_HISTORY) {
+        if (d->m_currentIndex >= d->m_recentSearchesBox->count() - 1) {
+            // temporarily set the index to the last but one existing
+            d->m_currentIndex = d->m_recentSearchesBox->count() - 2;
+        }
         d->m_searchResultWidgets.last()->notifyVisibilityChanged(false);
         // widget first, because that might send interesting signals to SearchResult
         delete d->m_searchResultWidgets.takeLast();
         delete d->m_searchResults.takeLast();
         d->m_recentSearchesBox->removeItem(d->m_recentSearchesBox->count()-1);
-        if (d->m_currentIndex >= d->m_recentSearchesBox->count()) {
-            // temporarily set the index to the last existing
-            d->m_currentIndex = d->m_recentSearchesBox->count() - 1;
-        }
     }
     auto widget = new SearchResultWidget;
     connect(widget, &SearchResultWidget::filterInvalidated, this, [this, widget] {