More bench fix and adaptation