A few CSharp related changes