Minor changes for FxCop