Make finder changes as backward compatible.