Fix sonar warning, add benchmarks