Dependency and path tweaks