Fixed issues with Foe DR and CC tracking