More bench change
Cleaning up some bench implementation
Fix some more build issues
Buffer bench fixes