More dependency fixes Credits @pbeeler