Some dependency wrangling...