Small updates to scenario CMM configuration files