Minor fixes & Benchmark