fixups for HiBench