Update how we call dependencies (and make sure OSX works)