Updated references and NuGet stuff