Fix cucumber issues