Sorted out several base dependencies