Nuget package fixes and reference fixes.