Fixed some capybara issues