C#: Additional changes.