Fixing dependency issues.