OK, I hope these changes to deps work...