Small fixes to the deployment scenario framework: