diff --git a/changelog.d/release-fixes.skip b/changelog.d/release-fixes.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 48f6d1d8e..f1861748b 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -9,6 +9,7 @@ import {
   highlightStyle,
 } from '../../services/user_highlighter/user_highlighter.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
 
@@ -89,8 +90,7 @@ const MentionLink = {
       // XXX assumed that domain does not contain @
       return (
         this.user &&
-        (this.userNameFullUi.split('@')[1] ||
-          this.$store.getters.instanceDomain)
+        (this.userNameFullUi.split('@')[1] || useInstanceStore().instanceDomain)
       )
     },
     userNameFull() {
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 1c1191940..c526eef79 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -4,7 +4,7 @@
     ref="root"
   >
     <Status
-      class="Notification"
+      class="Notification panel-body"
       :compact="true"
       :statusoid="notification.status"
       @click="interacted"
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index e02b71b0c..2341d21c5 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -104,8 +104,8 @@ const StatusActionButtons = {
       }
     },
     doActionReal(button) {
-      button
-        .action?.(this.funcArg)
+      const promise = button.action?.(this.funcArg) ?? Promise.resolve()
+      promise
         .then(() => this.$emit('onSuccess'))
         .catch((err) => this.$emit('onError', err))
     },
diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index a3c5b61cd..07327af27 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -86,7 +86,7 @@ export default {
         this.onSwitch.call(null, this.slots()[index].key)
       }
       this.active = index
-      if (this.scrollableTabs) {
+      if (this.scrollableTabs && this.$refs.contents) {
         this.$refs.contents.scrollTop = 0
       }
     },