Hmm, have to backport some fixes in order to run benchmarks