Fix things that depended on finch