C# generation improvements