Fixed dependency issues.