Fixing missing and broken dependencies