Stabilize cukes

Ongoing effort, contributions welcome!