FxCop warning fixes