Fixes to work as load test