Some FxCop fixes