Fix some benchmark issues but not all.