Fixed FxCop issues