Fix some dependency issues.