Capybara fixes