Fix more FxCop