Adjust dependencies - finally read the actual manual