diff --git a/src/SilverStripe/BehatExtension/Context/BasicContext.php b/src/SilverStripe/BehatExtension/Context/BasicContext.php
index fe22501..3d9d9b6 100644
--- a/src/SilverStripe/BehatExtension/Context/BasicContext.php
+++ b/src/SilverStripe/BehatExtension/Context/BasicContext.php
@@ -290,6 +290,17 @@ JS;
         $matchedEl->click();
     }
 
+    /**
+     * Needs to be in single command to avoid "unexpected alert open" errors in Selenium.
+     * 
+     * @Given /^I press the "([^"]*)" button, confirming the dialog$/
+     */
+    public function stepIPressTheButtonConfirmingTheDialog($button)
+    {
+        $this->stepIPressTheButton($button);
+        $this->iConfirmTheDialog();
+    }
+
     /**
      * @Given /^I click "([^"]*)" in the "([^"]*)" element$/
      */
diff --git a/src/SilverStripe/BehatExtension/Context/FixtureContext.php b/src/SilverStripe/BehatExtension/Context/FixtureContext.php
index c896036..a690f37 100644
--- a/src/SilverStripe/BehatExtension/Context/FixtureContext.php
+++ b/src/SilverStripe/BehatExtension/Context/FixtureContext.php
@@ -409,7 +409,7 @@ class FixtureContext extends BehatContext
         $type = trim($type);
 
         // Try direct mapping
-        $class = str_replace(' ', '', ucfirst($type));
+        $class = str_replace(' ', '', ucwords($type));
         if(class_exists($class) || !($class == 'DataObject' || is_subclass_of($class, 'DataObject'))) {
             return $class;
         }