Final updates for cukes