diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index 7b34eb05e..5d567aa33 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-%ul.comments{:id => post_id, :class => ("hidden" if defined?(hidden) && hidden)}
+%ul.comments{:id => post_id, :class => ("hidden" if comment_hashes.size == 0)}
   - for comment_hash in comment_hashes
     = render 'comments/comment', comment_hash
   %li.comment.show
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 2c9d00c3d..7886fd040 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -25,11 +25,11 @@
           = render 'shared/reshare', :current_user => current_user, :post => post if post.is_a? StatusMessage
           = link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
-    = render type_partial(post), :post => post
+    = render 'status_messages/status_message', :post => post
 
     .info
-      %span.time= link_to(how_long_ago(post), object_path(post))
+      %span.time= link_to(how_long_ago(post), status_message_path(post))
 
       = comment_toggle(comments.length)
-    = render "comments/comments", :post_id => post.id, :comment_hashes => comments, :hidden => (comments.length == 0)
+    = render "comments/comments", :post_id => post.id, :comment_hashes => comments