diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 69a1e0ef..d6b3d15d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 
 on:
   release:
-    types: [released]
+    types: [released, prereleased]
 
 permissions:
   contents: write
diff --git a/src/components/UI/Toast.tsx b/src/components/UI/Toast.tsx
index 1762b03e..35e185e9 100644
--- a/src/components/UI/Toast.tsx
+++ b/src/components/UI/Toast.tsx
@@ -28,7 +28,7 @@ const toastVariants = cva(
     variants: {
       variant: {
         default:
-          "border bg-white text-slate-900 dark:text-slate-100 dark:bg-slate-800",
+          "border bg-white text-slate-900 dark:text-slate-100 dark:bg-slate-800 dark:border-slate-700",
         destructive:
           "group destructive bg-red-600 text-white dark:border-red-900 dark:bg-red-900 dark:text-red-50",
       },
diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index 328fbc02..77541d0b 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -48,7 +48,7 @@ export const Dashboard = () => {
                       >
                         <div className="flex items-center justify-between">
                           <p className="truncate text-sm font-medium text-accent">
-                            {device.nodes.get(device.hardware.myNodeNum)?.user
+                            {device.getNode(device.hardware.myNodeNum)?.user
                               ?.longName ?? "UNK"}
                           </p>
                           <div className="inline-flex w-24 justify-center gap-2 rounded-full bg-slate-100 py-1 text-xs font-semibold text-slate-900 transition-colors hover:bg-slate-700 hover:text-slate-50">
@@ -78,9 +78,9 @@ export const Dashboard = () => {
                                 className="text-slate-400"
                                 aria-hidden="true"
                               />
-                              {device.nodes.size === 0
+                              {device.getNodesLength() === 0
                                 ? 0
-                                : device.nodes.size - 1}
+                                : device.getNodesLength() - 1}
                             </div>
                           </div>
                         </div>
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 13d91361..7236e6e5 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -19,6 +19,7 @@ import {
 } from "@core/stores/messageStore/index.ts";
 import { useSidebar } from "@core/stores/sidebarStore.tsx";
 import { Input } from "@components/UI/Input.tsx";
+import { randId } from "@core/utils/randId.ts";
 
 type NodeInfoWithUnread = Protobuf.Mesh.NodeInfo & { unreadCount: number };
 
@@ -113,8 +114,8 @@ export const MessagesPage = () => {
     } catch (e: any) {
       console.error("Failed to send message:", e);
       // Note: messageId might be undefined here if the error occurred before it was assigned
+      const failedId = messageId ?? randId();
       if (chatType === MessageType.Broadcast) {
-        const failedId = messageId ?? `failed-${Date.now()}`;
         setMessageState({
           type: chatType,
           channelId: channelValue,
@@ -122,7 +123,7 @@ export const MessagesPage = () => {
           newState: MessageState.Failed,
         });
       } else { // MessageType.Direct
-        const failedId = messageId ?? `failed-${Date.now()}`;
+        const failedId = messageId ?? randId();
         setMessageState({
           type: chatType,
           nodeA: getMyNodeNum(),