further small adaptations for SHERPA