Convert last benchmarks and some additional improvements