Various depends improvements.