diff --git a/src/Invite.js b/src/Invite.js
index b8e33d318a..9be3da53e4 100644
--- a/src/Invite.js
+++ b/src/Invite.js
@@ -127,7 +127,7 @@ function _onRoomInviteFinished(roomId, shouldInvite, addrs) {
 }
 
 function _isDmChat(addrTexts) {
-    if (addrTexts.length === 1 && getAddressType(addrTexts[0])) {
+    if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx') {
         return true;
     } else {
         return false;
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 499fdf21cc..63f5a749f3 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -56,7 +56,7 @@ module.exports = React.createClass({
             editing: false,
             inRoom: false,
             onSaveClick: function() {},
-            onCancelClick: function() {},
+            onCancelClick: null,
         };
     },
 
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 86a8d09234..f5dd9e017c 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -158,6 +158,7 @@ class RoomViewStore extends Store {
                     highlighted: payload.highlighted,
                     room_alias: payload.room_alias,
                     auto_join: payload.auto_join,
+                    oob_data: payload.oob_data,
                 });
             }, (err) => {
                 dis.dispatch({