CSHARP-712 - Minor changes to allow building from VS