Tiny changes to get cucumber running properly for CI.