Fix things broken by updated deps