diff --git a/app/src/components/Settings.tsx b/app/src/components/Settings.tsx
index f29ff57..35b23fa 100644
--- a/app/src/components/Settings.tsx
+++ b/app/src/components/Settings.tsx
@@ -84,14 +84,14 @@ class Settings extends React.Component<Props, {}> {
   }
 
   private renderAutoExpand() {
-    const { classes, actions, autoExpandLimit } = this.props
+    const { classes, autoExpandLimit } = this.props
 
     return (
         <div style={{ padding: '8px' }}>
         <InputLabel htmlFor="auto-expand">Auto Expand</InputLabel>
         <Select
             value={autoExpandLimit}
-            onChange={(e: React.ChangeEvent<HTMLSelectElement>) => actions.setAutoExpandLimit(e.target.value)}
+            onChange={this.onChangeAutoExpand}
             input={<Input name="auto-expand" id="auto-expand-label-placeholder" />}
             displayEmpty={true}
             name="auto-expand"
@@ -107,6 +107,10 @@ class Settings extends React.Component<Props, {}> {
     )
   }
 
+  private onChangeAutoExpand = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    this.props.actions.setAutoExpandLimit(e.target.value)
+  }
+
   private renderNodeOrder() {
     const { classes, nodeOrder } = this.props
 
diff --git a/events/Events.ts b/events/Events.ts
index 69ebfc2..9bd3e32 100644
--- a/events/Events.ts
+++ b/events/Events.ts
@@ -28,14 +28,14 @@ export interface Message {
   payload: any
 }
 
-export function makeConnectionMessageEvent(connectionId: string): Event<Message> {
-  return {
-    topic: `conn/${connectionId}`,
-  }
-}
-
 export function makePublishEvent(connectionId: string): Event<Message> {
   return {
     topic: `conn/publish/${connectionId}`,
   }
 }
+
+export function makeConnectionMessageEvent(connectionId: string): Event<Message> {
+  return {
+    topic: `conn/${connectionId}`,
+  }
+}
diff --git a/package.json b/package.json
index 9f636eb..030e41e 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   },
   "build": {
     "appId": "mqtt-explorer",
+    "nodeGypRebuild": true,
     "mac": {
       "category": "de.t7n.apps.mq-explorer",
       "publish": [