diff --git a/c++/carla-backend/carla_plugin.h b/c++/carla-backend/carla_plugin.h
index 134dd30..2949a55 100644
--- a/c++/carla-backend/carla_plugin.h
+++ b/c++/carla-backend/carla_plugin.h
@@ -1472,6 +1472,7 @@ public:
         }
 
         // Programs
+        if (prog.count > 0)
         {
 #ifdef BUILD_BRIDGE
             x_engine->osc_send_bridge_program_count(prog.count);
@@ -1491,6 +1492,7 @@ public:
         }
 
         // MIDI Programs
+        if (midiprog.count > 0)
         {
 #ifdef BUILD_BRIDGE
             x_engine->osc_send_bridge_midi_program_count(midiprog.count);
diff --git a/c++/carla-bridge/carla_bridge_plugin.cpp b/c++/carla-bridge/carla_bridge_plugin.cpp
index c9a7dae..c950767 100644
--- a/c++/carla-bridge/carla_bridge_plugin.cpp
+++ b/c++/carla-bridge/carla_bridge_plugin.cpp
@@ -291,7 +291,6 @@ public:
     void handleCallback(const CarlaBackend::CallbackType action, const int value1, const int value2, const double value3)
     {
         qDebug("CarlaPluginClient::handleCallback(%s, %i, %i, %g)", CarlaBackend::CallbackType2str(action), value1, value2, value3);
-        Q_ASSERT(engine);
 
         if (! engine)
             return;
diff --git a/src/carla_backend.py b/src/carla_backend.py
index a7fc93b..a19bcf1 100644
--- a/src/carla_backend.py
+++ b/src/carla_backend.py
@@ -323,7 +323,7 @@ if os.path.exists(os.path.join(CWDpp, "carla-discovery", "carla-discovery-win32.
     carla_discovery_win32 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-win32.exe")
 else:
     for p in PATH:
-        if os.path.exists(os.path.join(p, "carla-discovery-wine32.exe")):
+        if os.path.exists(os.path.join(p, "carla-discovery-win32.exe")):
             carla_discovery_win32 = os.path.join(p, "carla-discovery-win32.exe")
             break
 
@@ -359,7 +359,7 @@ if os.path.exists(os.path.join(CWDpp, "carla-bridge", "carla-bridge-win32.exe"))
     carla_bridge_win32 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-win32.exe")
 else:
     for p in PATH:
-        if os.path.exists(os.path.join(p, "carla-bridge-wine32.exe")):
+        if os.path.exists(os.path.join(p, "carla-bridge-win32.exe")):
             carla_bridge_win32 = os.path.join(p, "carla-bridge-win32.exe")
             break