Fix more cukes