Resolve some dependency issues.