Fix a couple of bugs needed for
https://github.com/cucumber/cucumber/pull/590