Some minor fixes for running wip scenarios