Fixes for load test