CSharp: Some changes