Moved up some dependencies