Finally fix all the mucked up dependencies