A Set of Core Changes to the Application of FATCA