Fixing/upgrading dependencies