diff --git a/src/components/ha-label.ts b/src/components/ha-label.ts
index ffb4d06126..dd0ed75d44 100644
--- a/src/components/ha-label.ts
+++ b/src/components/ha-label.ts
@@ -5,11 +5,11 @@ import { customElement } from "lit/decorators";
 class HaLabel extends LitElement {
   protected render(): TemplateResult {
     return html`
-        <span class="label">
-            <slot name="icon"></slot>
-            <slot></slot>
-        </div>
-      `;
+      <span class="label">
+        <slot name="icon"></slot>
+        <slot></slot>
+      </span>
+    `;
   }
 
   static get styles(): CSSResultGroup {
diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts
index 790df95b67..3600514238 100644
--- a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts
@@ -181,7 +181,7 @@ class DialogMQTTDeviceDebugInfo extends LitElement {
                         { n: topic.messages.length }
                       )}
                     >
-                    </mqtt-rx-messages>
+                    </mqtt-messages>
                   </li>
                 `
               )}
@@ -204,7 +204,7 @@ class DialogMQTTDeviceDebugInfo extends LitElement {
                         { n: topic.messages.length }
                       )}
                     >
-                    </mqtt-tx-messages>
+                    </mqtt-messages>
                   </li>
                 `
               )}
diff --git a/src/panels/developer-tools/assist/developer-tools-assist.ts b/src/panels/developer-tools/assist/developer-tools-assist.ts
index 7c3bdb3506..de7e22c36b 100644
--- a/src/panels/developer-tools/assist/developer-tools-assist.ts
+++ b/src/panels/developer-tools/assist/developer-tools-assist.ts
@@ -165,7 +165,7 @@ class HaPanelDevAssist extends SubscribeMixin(LitElement) {
                   ${this.hass.localize(
                     "ui.panel.developer-tools.tabs.assist.download_results"
                   )}
-                </button>
+                </ha-button>
               </div>
             `
           : ""}
diff --git a/src/panels/developer-tools/debug/developer-tools-debug.ts b/src/panels/developer-tools/debug/developer-tools-debug.ts
index 6a5aa730cd..3d06c4d065 100644
--- a/src/panels/developer-tools/debug/developer-tools-debug.ts
+++ b/src/panels/developer-tools/debug/developer-tools-debug.ts
@@ -1,5 +1,6 @@
-import { CSSResultGroup, LitElement, css, html } from "lit";
+import { LitElement, css, html } from "lit";
 import { customElement, property } from "lit/decorators";
+import "../../../components/ha-card";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
@@ -18,31 +19,27 @@ class HaPanelDevDebug extends SubscribeMixin(LitElement) {
           .header=${this.hass.localize(
             "ui.panel.developer-tools.tabs.debug.title"
           )}
-          class="form"
         >
-          <div class="card-content">
-                  <ha-debug-connection-row
-                    .hass=${this.hass}
-                    .narrow=${this.narrow}
-                  ></ha-debug-connection-row>
+          <ha-debug-connection-row
+            .hass=${this.hass}
+            .narrow=${this.narrow}
+          ></ha-debug-connection-row>
         </ha-card>
       </div>
     `;
   }
 
-  static get styles(): CSSResultGroup {
-    return [
-      haStyle,
-      css`
-        .content {
-          padding: 28px 20px 16px;
-          display: block;
-          max-width: 600px;
-          margin: 0 auto;
-        }
-      `,
-    ];
-  }
+  static styles = [
+    haStyle,
+    css`
+      .content {
+        padding: 28px 20px 16px;
+        display: block;
+        max-width: 600px;
+        margin: 0 auto;
+      }
+    `,
+  ];
 }
 
 declare global {
diff --git a/tsconfig.json b/tsconfig.json
index 3c9fb36ebc..f54276cf0b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,7 +28,6 @@
         "strict": true,
         "rules": {
           // Custom elements
-          "no-unclosed-tag": "warning",
           "no-missing-element-type-definition": "error",
           // Binding names
           "no-legacy-attribute": "error",