Patching up the step definitions