Fixed generation issues