Fix finder collection errors