Upgrading dependencies and fixing up some details.