fixes to get gcc to work on all benchmarks