Sorting out some dependencies