More fixes to the load generator