Fixes based on nuget tests.