diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 6dcadaf63f..ecd4847d0d 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -109,7 +109,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
     tabIndex?: number,
     disabled?: boolean,
     className?: string,
-    onClick(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
+    onClick?(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
 };
 
 interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index 4cb2fa1ef1..902538052b 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -20,7 +20,7 @@ import classNames from "classnames";
 import * as sdk from "../../../index";
 
 // Controlled Toggle Switch element, written with Accessibility in mind
-export default ({checked, disabled=false, onChange, ...props}: IProps) => {
+export default ({checked, disabled = false, onChange, ...props}: IProps) => {
     const _onClick = () => {
         if (disabled) return;
         onChange(!checked);
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index d3bb19729d..590c38931e 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -182,7 +182,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                                 tabIndex={tabIndex}
                                 className={"mx_RoomSubList_label"}
                                 role="treeitem"
-                                aria-level="1"
+                                aria-level={1}
                             >
                                 {chevron}
                                 <span>{this.props.label}</span>