Fixes for stress test.