few fixes and benches