Fixing "breaking packages"