Introduce new argument, fix some deprecations, update Capybara