Fix FATCA in various file formats