Fix behaviour for benoit

This fixes some of the behaviour to match what Benoit needs for the pipeline.