Some benchmarking improvements