Issues in scenarios fixed