Updated code to support latest NuGet builds.

All 635u, 343i tests pass.