fix variable shadowing
minor benchmark build tweaks to be consistent with master