Small generator changes