Fixing issues in FIP-ECMP case