Fix FxCop errors