Fix up some dependencies