Add some benchmark optimizations