Fixed some issues behat just discovered for me