Multiple fixes

bench: 8091813