Fixing dependency management.