Fixed FxCop issues...