Fixed some dependency issues.