Dependency and fix for package files