Fix a couple of nondeterministic test failures
Some benchmarks working