Fixes to do WACCPD benchmarking on Sabuas