Make dep handling consistent