diff --git a/src/lib/components/layout/GenericLayout.svelte b/src/lib/components/layout/GenericLayout.svelte
index 1d4b742e..38ac28f9 100644
--- a/src/lib/components/layout/GenericLayout.svelte
+++ b/src/lib/components/layout/GenericLayout.svelte
@@ -125,9 +125,9 @@
     if (!keyInfo) return;
     const clickedGroup = groupParent.children.item(index) as SVGGElement;
     const nextAction =
-      get(layout)[get(activeProfile)][get(activeLayer)]?.[keyInfo.id];
+      get(layout)[get(activeProfile)]![get(activeLayer)]?.[keyInfo.id];
     const currentAction =
-      get(deviceLayout)[get(activeProfile)][get(activeLayer)]?.[keyInfo.id];
+      get(deviceLayout)[get(activeProfile)]![get(activeLayer)]?.[keyInfo.id];
     const component = mount(ActionSelector, {
       target: document.body,
       props: {
@@ -143,6 +143,7 @@
                 type: ChangeType.Layout,
                 id: keyInfo.id,
                 layer: get(activeLayer),
+                profile: get(activeProfile),
                 action,
               },
             ]);
diff --git a/src/lib/serial/device.ts b/src/lib/serial/device.ts
index ea841444..4100ad57 100644
--- a/src/lib/serial/device.ts
+++ b/src/lib/serial/device.ts
@@ -140,8 +140,7 @@ export class CharaDevice {
       this.version = await this.send(1, ["VERSION"]).then(
         ([version]) => version,
       );
-      // TODO: beta.3
-      if (semverGte(this.version, "2.2.0-beta.3")) {
+      if (semverGte(this.version, "2.2.0-beta.4")) {
         this.profileCount = 3;
       }
       const [company, device, chipset] = await this.send(3, ["ID"]);
diff --git a/src/lib/setting.ts b/src/lib/setting.ts
index e278664f..fc00e463 100644
--- a/src/lib/setting.ts
+++ b/src/lib/setting.ts
@@ -3,6 +3,7 @@ import { changes, ChangeType, settings } from "$lib/undo-redo";
 import { activeProfile } from "./serial/connection";
 import { combineLatest, map } from "rxjs";
 import { fromReadable } from "./util/from-readable";
+import { get } from "svelte/store";
 
 /**
  * https://gist.github.com/mjackson/5311256
@@ -168,6 +169,7 @@ export const setting: Action<
             type: ChangeType.Setting,
             id: id + i,
             setting: value,
+            profile: get(activeProfile),
           })),
         );
         return changes;
@@ -183,6 +185,7 @@ export const setting: Action<
           type: ChangeType.Setting,
           id: id,
           setting: value,
+          profile: get(activeProfile),
         },
       ]);
       return changes;