Minor changes around dependencies.