Some generator changes.