Cross finder fixes