diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 298372a4d8..ef4d10e66b 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -321,7 +321,7 @@ module.exports = React.createClass({
                 }
 
                 ret.push(
-                    <MemberEventListSummary events={summarisedEvents}>
+                    <MemberEventListSummary key={mxEv.getId()} events={summarisedEvents}>
                         {eventTiles}
                     </MemberEventListSummary>
                 );
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 7f9630d416..161c37ef55 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -30,9 +30,9 @@ module.exports = React.createClass({
         height: React.PropTypes.number,
         resizeMethod: React.PropTypes.string,
         // The onClick to give the avatar
-        onClick: React.PropTypes.function,
+        onClick: React.PropTypes.func,
         // Whether the onClick of the avatar should be overriden to dispatch 'view_user'
-        viewUserOnClick: React.PropTypes.boolean,
+        viewUserOnClick: React.PropTypes.bool,
     },
 
     getDefaultProps: function() {