Fixed scenario issues.