diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 29a6621f3..ffbf35d2f 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -4,7 +4,7 @@
 
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, :key => '_diaspora_session'
+Rails.application.config.session_store :cookie_store, :key => '_diaspora_session', :httponly => false
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index 3cde39634..2b308832b 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -25,7 +25,7 @@ def write_pidfile
 end
 
 def debug_pp thing
-  pp thing if APP_CONFIG[:socket_debug] || ENV[:SOCKET_DEBUG]
+  pp thing if APP_CONFIG[:socket_debug] || ENV['SOCKET_DEBUG']
 end
 
 CHANNEL = Magent::GenericChannel.new('websocket')