Bench fix and optimize