Adding file generation script fixes