Generator improvements.