diff --git a/openpilot/tools/cabana/signalview.h b/openpilot/tools/cabana/signalview.h
index 2e44e55cbf..bccfbab0cc 100644
--- a/openpilot/tools/cabana/signalview.h
+++ b/openpilot/tools/cabana/signalview.h
@@ -129,11 +129,11 @@ private:
       // update widget geometries in QTreeView::rowsInserted
       QTreeView::rowsInserted(parent, start, end);
     }
-    void setModel(QAbstractItemModel *model) override {
-      QTreeView::setModel(model);
+    void setModel(QAbstractItemModel *m) override {
+      QTreeView::setModel(m);
       // Bypass the slow call to QTreeView::dataChanged.
-      QObject::disconnect(model, &QAbstractItemModel::dataChanged, this, nullptr);
-      QObject::connect(model, &QAbstractItemModel::dataChanged, this,
+      QObject::disconnect(m, &QAbstractItemModel::dataChanged, this, nullptr);
+      QObject::connect(m, &QAbstractItemModel::dataChanged, this,
                        [this](const QModelIndex &tl, const QModelIndex &br, const auto &roles) { QAbstractItemView::dataChanged(tl, br, roles); });
     }
     void leaveEvent(QEvent *event) override {
diff --git a/openpilot/tools/cabana/streams/devicestream.cc b/openpilot/tools/cabana/streams/devicestream.cc
index 91e890316e..3bd51c079d 100644
--- a/openpilot/tools/cabana/streams/devicestream.cc
+++ b/openpilot/tools/cabana/streams/devicestream.cc
@@ -53,7 +53,7 @@ void DeviceStream::start() {
   if (!zmq_address.isEmpty()) {
     stopBridge();
     const std::string path = (std::filesystem::path(QCoreApplication::applicationDirPath().toStdString()) /
-                              "../../openpilot/cereal/messaging/bridge").lexically_normal().string();
+                              "../../cereal/messaging/bridge").lexically_normal().string();
     const std::string addr = zmq_address.toStdString();
     const char *can_filter = "/\"can/\"";