Fixed some generation issues.