Fix dependency issues.