Fix issues with /FitR destinations