Scenario bug fixes and tweaks