Fixed some generators