Form generate command fixes