diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index a74b12e433e0c413a81fec0c5c2ba3037df2f9ca..4075e04edfdc58e7c35c833f37fa9519f9dbe1e8 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -24,7 +24,6 @@ class BlogsController < ApplicationController
 
     if @blog.created_at
       flash[:notice] = "Successfully created blog."
-      redirect_to @blog
     else
       render :action => 'new'
     end
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 79bf76d12e1083cce4b8f9ffc6a681f90c72f21b..760a3255c2298662b9bdd956e1eb51f6b97ea612 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -34,7 +34,6 @@ class BookmarksController < ApplicationController
 
     if @bookmark.created_at
       flash[:notice] = "Successfully created bookmark."
-      redirect_to @bookmark
     else
       render :action => 'new'
     end
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 9956902133dba51e44394e183c9af7e371d9dae7..2996a23ecd8e145f3c5b9b6d288cbb2f14809ff4 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -7,7 +7,6 @@ class PhotosController < ApplicationController
 
       if @photo.created_at
         flash[:notice] = "Successfully uploaded photo."
-        redirect_to @photo.album
       else
         render :action => 'album#new'
       end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index f499492e83521bab7e577eaf5a12129bd63763b9..8cc73bac1caf137e91b3b3b2dc3f48c599948ea4 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -1,5 +1,5 @@
 class StatusMessagesController < ApplicationController
-  #before_filter :authenticate_user!
+  before_filter :authenticate_user!
 
   def index
     @status_messages = StatusMessage.paginate :page => params[:page], :order => 'created_at DESC'
@@ -16,7 +16,6 @@ class StatusMessagesController < ApplicationController
     
     if @status_message.created_at
       flash[:notice] = "Successfully created status message."
-      redirect_to status_messages_url
     else
       render :action => 'new'
     end
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index ba78ed81a0572aa4fc72c3517c2270839cbf3874..959010e61ac709ccc94f960ec612c025315a69a8 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -40,10 +40,11 @@ module Diaspora
 
         def people_with_permissions
           begin
-          friends = self.person.owner.friends
+          friends = self.person.owner.friends.all
+          Rails.logger.error("Dan is wrong!") if friends.nil?
           friends ||= []
           rescue
-            Rails.logger.fatal("IOUASDVJOISDNVPOIJSDVOUIDSGPUOID")
+            Rails.logger.fatal("Called people_with_permissions on a post from a remote user.  We need to implement this shit.")
             []
           end
         end