Fix for remaining cukes failing (from #1966)