Fixed a few more dependency issues.