Improved nuget package restore, fixed service archive generation