diff --git a/src/components/views/right_panel/HeaderButtons.tsx b/src/components/views/right_panel/HeaderButtons.tsx
index 8141e8a9cc..499fbbd414 100644
--- a/src/components/views/right_panel/HeaderButtons.tsx
+++ b/src/components/views/right_panel/HeaderButtons.tsx
@@ -24,6 +24,7 @@ import RightPanelStore from "../../../stores/RightPanelStore";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from '../../../dispatcher/actions';
 import {SetRightPanelPhasePayload, SetRightPanelPhaseRefireParams} from '../../../dispatcher/payloads/SetRightPanelPhasePayload';
+import {EventSubscription} from "fbemitter";
 
 export enum HeaderKind {
   Room = "room",
@@ -38,7 +39,7 @@ interface IState {
 interface IProps {}
 
 export default class HeaderButtons extends React.Component<IProps, IState> {
-    private storeToken: ReturnType<RightPanelStore["addListener"]>;
+    private storeToken: EventSubscription;
     private dispatcherRef: string;
 
     constructor(props: IProps, kind: HeaderKind) {
diff --git a/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.ts b/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.ts
index 3193f9043b..cfd4a2d3cc 100644
--- a/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.ts
+++ b/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.ts
@@ -18,10 +18,12 @@ import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import { SetRightPanelPhaseRefireParams } from "./SetRightPanelPhasePayload";
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 interface AfterRightPanelPhaseChangeAction extends ActionPayload {
     action: Action.AfterRightPanelPhaseChange;
     phase: RightPanelPhases;
+    verificationRequestPromise?: Promise<VerificationRequest>;
 }
 
 export type AfterRightPanelPhaseChangePayload
diff --git a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
index b7dd5d85fc..75dea9f3df 100644
--- a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
+++ b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
@@ -24,7 +24,7 @@ export interface SetRightPanelPhasePayload extends ActionPayload {
     action: Action.SetRightPanelPhase;
 
     phase: RightPanelPhases;
-    refireParams: SetRightPanelPhaseRefireParams;
+    refireParams?: SetRightPanelPhaseRefireParams;
 }
 
 export interface SetRightPanelPhaseRefireParams {