Fix more dependency issues.