Fixed FXCop/OACR errors