Fixed up dependency issues.