Small fixes. Benchmark going on.