Various reporting and scenario definition fixes