Fixing some cucumber errors

A few minor fixes.
this is good as a workaround, but I really hope we can get this to perform reliably the way we want it to.