diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index f453db2d6..ce77021ce 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -63,7 +63,7 @@ namespace BlackConfig
         //! Beta test?
         static bool isBetaTest();
 
-        //! Can run in dev. environment
+        //! Can run in dev. environment?
         static bool canRunInDeveloperEnvironment();
 
         //! Shipped version?
diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp
index f08504052..a425481d6 100644
--- a/src/blackcore/setupreader.cpp
+++ b/src/blackcore/setupreader.cpp
@@ -160,7 +160,7 @@ namespace BlackCore
             QFile f(this->m_localSetupFileValue);
             if (!f.exists())
             {
-                sApp->cmdLineErrorMessage("File " + this->m_localSetupFileValue + " does not exist");
+                sApp->cmdLineErrorMessage(QString("File '%1' does not exist)").arg(this->m_localSetupFileValue));
                 return false;
             }
         }
@@ -172,7 +172,7 @@ namespace BlackCore
             {
                 if (!CNetworkUtils::canConnect(url))
                 {
-                    sApp->cmdLineErrorMessage("URL " + urlString + " not reachable");
+                    sApp->cmdLineErrorMessage(QString("URL '%1' not reachable").arg(urlString));
                     return false;
                 }
             }
diff --git a/src/blackgui/components/registercomponent.ui b/src/blackgui/components/registercomponent.ui
index 0e8e55afe..412ba2e8d 100644
--- a/src/blackgui/components/registercomponent.ui
+++ b/src/blackgui/components/registercomponent.ui
@@ -34,6 +34,9 @@
    </property>
    <item>
     <widget class="BlackGui::Views::CIdentifierView" name="tvp_RegisteredComponents">
+     <property name="selectionMode">
+      <enum>QAbstractItemView::NoSelection</enum>
+     </property>
      <attribute name="verticalHeaderVisible">
       <bool>false</bool>
      </attribute>
diff --git a/src/blackgui/dockwidgetinfobar.cpp b/src/blackgui/dockwidgetinfobar.cpp
index cca675c67..5628b3320 100644
--- a/src/blackgui/dockwidgetinfobar.cpp
+++ b/src/blackgui/dockwidgetinfobar.cpp
@@ -35,7 +35,7 @@ namespace BlackGui
 
     void CDockWidgetInfoBar::ps_onStyleSheetsChanged()
     {
-        QString st = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameInfoBar());
+        const QString st = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameInfoBar());
         this->setStyleSheet(st);
     }
 }
diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp
index 2ba2efd39..3ea4f4f92 100644
--- a/src/blackmisc/fileutils.cpp
+++ b/src/blackmisc/fileutils.cpp
@@ -307,12 +307,15 @@ namespace BlackMisc
         return it->filePath();
     }
 
+    //! \privatesection
+    //! @{
     QStringList getSwiftExecutablesImpl()
     {
         static const QFileInfo mySelf = QFileInfo(QCoreApplication::applicationFilePath()); // path + dir
         static const QStringList filter("*." + mySelf.suffix());
         return mySelf.dir().entryList(filter);
     }
+    //! @}
 
     const QStringList &CFileUtils::getSwiftExecutables()
     {
diff --git a/src/swiftcore/swiftcore.ui b/src/swiftcore/swiftcore.ui
index aca5bbc17..7ba3919e8 100644
--- a/src/swiftcore/swiftcore.ui
+++ b/src/swiftcore/swiftcore.ui
@@ -14,13 +14,13 @@
    <string>swiftcore</string>
   </property>
   <widget class="QWidget" name="qw_MainWidget">
-   <layout class="QGridLayout" name="gridLayout_2">
+   <layout class="QGridLayout" name="gl_Main">
     <item row="1" column="2">
      <widget class="QGroupBox" name="gb_Controls">
       <property name="title">
        <string>Controls</string>
       </property>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gl_Controls">
        <item row="0" column="1">
         <widget class="QPushButton" name="pb_StartCore">
          <property name="styleSheet">
@@ -86,7 +86,7 @@ QTextEdit {
       <property name="title">
        <string>DBus Mode</string>
       </property>
-      <layout class="QGridLayout" name="gridLayout_3">
+      <layout class="QGridLayout" name="gl_DBusMode">
        <item row="0" column="0">
         <widget class="QRadioButton" name="rb_SessionBus">
          <property name="text">