Fixes of apachebench refactoring