Fixing the build of Scenario