Pull to fixe some fatal errors in J2.5

This fixes fatal errors in router and finder calling function that do not exist in J2.5 and are not used at this point.