Fix dependency problems.