Tweaks for using customer generators.