diff --git a/.gitignore b/.gitignore
index 134a86d93..19a4b038a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 HTML
 .DS_Store
 coverage
+dump.rdb
diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js
index 46f8764fa..3272380ce 100644
--- a/web/app/assets/javascripts/layout.js
+++ b/web/app/assets/javascripts/layout.js
@@ -787,7 +787,7 @@
     this.notify = function (message, buttons, noCancel) {
       if (!buttons) {
         if (noCancel) {
-          buttons = okButton;
+          buttons = [okButton];
         }
         else {
           buttons = defaultButtons;
diff --git a/web/lib/music_session_manager.rb b/web/lib/music_session_manager.rb
index 8cc8144e8..fd24e399a 100644
--- a/web/lib/music_session_manager.rb
+++ b/web/lib/music_session_manager.rb
@@ -113,7 +113,7 @@ MusicSessionManager < BaseManager
 
         # send "musician joined session" notification only if it's not a band session since there will be a "band joined session" notification
         if music_session.band.nil?
-          Notification.send_musician_session_join(music_session, connection, user)
+          Notification.send_musician_session_join(music_session, user)
         end
       end
     end
diff --git a/web/spec/features/notification_highlighter_spec.rb b/web/spec/features/notification_highlighter_spec.rb
index 0f8dbc856..35b0e0438 100644
--- a/web/spec/features/notification_highlighter_spec.rb
+++ b/web/spec/features/notification_highlighter_spec.rb
@@ -157,7 +157,7 @@ describe "Notification Highlighter", :js => true, :type => :feature, :capybara_f
         badge = find("#{NOTIFICATION_PANEL} .badge", text: '1')
         badge['class'].include?('highlighted').should == true
 
-        find('#notification #btn-reply', text: 'ACCEPT').trigger(:click)
+        find('#notification #btn-accept', text: 'ACCEPT').trigger(:click)
 
         badge = find("#{NOTIFICATION_PANEL} .badge", text: '0')
         badge['class'].include?('highlighted').should == false