More fixes, readd the benchmark