Fixed generation errors