little fixes to the workload generator

Change-Id: Idc30f308591fc85b2f9e96c48be9dc1cc11e886e