Improvements to manually installed deps.