Fixing dependencies issues.