Fix some FxCop issues