HONEYCOMB-401 - Fix compilation issues for benchmark