Fix FIRM generation for arrays