diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs
index 6d362606d8..fcfd0374b5 100644
--- a/app/assets/javascripts/discourse/templates/group/members.hbs
+++ b/app/assets/javascripts/discourse/templates/group/members.hbs
@@ -3,7 +3,7 @@
     <tr>
       <th colspan="3" class="seen">{{i18n 'last_seen'}}</th>
     </tr>
-  {{#each m in members}}
+  {{#each model.members as |m|}}
     <tr>
       <td class='avatar'>
         {{avatar m imageSize="large"}}
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index d0b9bc4ddb..5f3f2b196a 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -59,7 +59,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
 
   resize: function() {
     const self = this;
-    Em.run.scheduleOnce('afterRender', function() {
+    Ember.run.scheduleOnce('afterRender', function() {
       const h = $('#reply-control').height() || 0;
       self.movePanels.apply(self, [h + "px"]);
 
@@ -116,11 +116,17 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
     const $replyControl = $('#reply-control'),
         self = this;
 
+    const resizer = function() {
+      Ember.run(function() {
+        self.resize();
+      });
+    };
+
     $replyControl.DivResizer({
-      resize: this.resize.bind(self),
+      resize: resizer,
       onDrag(sizePx) { self.movePanels.apply(self, [sizePx]); }
     });
-    afterTransition($replyControl, this.resize.bind(self));
+    afterTransition($replyControl, resizer);
     this.ensureMaximumDimensionForImagesInPreview();
     this.set('controller.view', this);
 
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index 295583db62..7edb95f5bf 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -40,7 +40,7 @@ test("editingMode", function() {
 test("toggledSelectedPost", function() {
   var tc = this.subject({ model: buildTopic() }),
       post = Discourse.Post.create({id: 123, post_number: 2}),
-      postStream = tc.get('postStream');
+      postStream = tc.get('model.postStream');
 
   postStream.appendPost(post);
   postStream.appendPost(Discourse.Post.create({id: 124, post_number: 3}));
@@ -62,7 +62,7 @@ test("toggledSelectedPost", function() {
 test("selectAll", function() {
   var tc = this.subject({model: buildTopic()}),
       post = Discourse.Post.create({id: 123, post_number: 2}),
-      postStream = tc.get('postStream');
+      postStream = tc.get('model.postStream');
 
   postStream.appendPost(post);
 
@@ -80,7 +80,7 @@ test("Automating setting of allPostsSelected", function() {
   var topic = buildTopic(),
       tc = this.subject({model: topic}),
       post = Discourse.Post.create({id: 123, post_number: 2}),
-      postStream = tc.get('postStream');
+      postStream = tc.get('model.postStream');
 
   topic.set('posts_count', 1);
   postStream.appendPost(post);