diff --git a/features/accepts_invitation.feature b/features/accepts_invitation.feature
index 3b5b4ae62..d675f1c00 100644
--- a/features/accepts_invitation.feature
+++ b/features/accepts_invitation.feature
@@ -14,7 +14,8 @@ Feature: invitation acceptance
       And I fill in the following:
         | profile_first_name | O             |
 
-      When I follow "awesome_button"
+      And I preemptively confirm the alert
+      And I follow "awesome_button"
       Then I should be on the multi page
 
     Scenario: accept invitation from user
@@ -31,7 +32,8 @@ Feature: invitation acceptance
       And I fill in the following:
         | profile_first_name | O             |
 
-      When I follow "awesome_button"
+      And I preemptively confirm the alert
+      And I follow "awesome_button"
       Then I should be on the multi page
 
     Scenario: sends an invitation
diff --git a/features/follows_tags.feature b/features/follows_tags.feature
index fd421ce65..8e289a8f5 100644
--- a/features/follows_tags.feature
+++ b/features/follows_tags.feature
@@ -37,7 +37,7 @@ Feature: posting
   Scenario: can stop following a tag from the homepage
     When I go to the home page
     And I preemptively confirm the alert
-    And I hover over the "li.unfollow#boss"
+    And I hover over the "li.unfollow#tag-following-boss"
     And I follow "unfollow_boss"
     And I wait for the ajax to finish
-    Then I should not see "#boss" within ".left_nav"
+    Then I should not see "#tag-following-boss" within ".left_nav"
diff --git a/features/signs_up.feature b/features/signs_up.feature
index 6bd069648..f911ea229 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -14,13 +14,15 @@ Feature: new user registration
     And I should see "What are you into?"
 
   Scenario: new user goes through the setup wizard
-    And I fill in the following:
+    When I fill in the following:
       | profile_first_name | O             |
+    And I preemptively confirm the alert
     And I follow "awesome_button"
 
     Then I should be on the multi page
     And I should not see "awesome_button"
 
   Scenario: new user skips the setup wizard
-    When I follow "awesome_button"
+    When I preemptively confirm the alert
+    And I follow "awesome_button"
     Then I should be on the multi page
diff --git a/features/step_definitions/conversations_steps.rb b/features/step_definitions/conversations_steps.rb
index 60e14d2e0..7d3c09ffd 100644
--- a/features/step_definitions/conversations_steps.rb
+++ b/features/step_definitions/conversations_steps.rb
@@ -1,6 +1,6 @@
 Then /^"([^"]*)" should be part of active conversation$/ do |name|
   within(".conversation_participants") do
-    find("img.avatar[title^='#{name} ']").should_not be_nil
+    find("img.avatar[title^='#{name}']").should_not be_nil
   end
 end