Fix stylecop warnings