Fix cucumber failures