Added contract repair for FAs, ASA_ID repair