Fixed FxCop violations