benchmark

f70f8f20 - Fix a subset of issues mentioned in #1567