Few fixes and extensions to the FSF file generator