Fixing broken dependencies