More FxCop fixes