Merge: Clean some errors in benches