diff --git a/etc/build_dir.sh b/etc/build_dir.sh
index c41f43968..1a73a320d 100755
--- a/etc/build_dir.sh
+++ b/etc/build_dir.sh
@@ -36,6 +36,10 @@ export OSX_TARGET=11.0
 
 # Build a build directory with that information
 export BUILD_DIR=$BUILD_ROOT/${CMAKE_BUILD_TYPE}
+if [[ $MRV2_DIST_RELEASE == 1 ]]; then
+    export BUILD_DIR=$BUILD_DIR-dist
+fi
+
 
 if [[ $KERNEL == *Darwin* ]]; then
     export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:${PATH}"
diff --git a/mrv2/lib/mrvNetwork/mrvCommandInterpreter.cpp b/mrv2/lib/mrvNetwork/mrvCommandInterpreter.cpp
index 886406a81..80a68b82f 100644
--- a/mrv2/lib/mrvNetwork/mrvCommandInterpreter.cpp
+++ b/mrv2/lib/mrvNetwork/mrvCommandInterpreter.cpp
@@ -1188,9 +1188,11 @@ namespace mrv
                     tcp->unlock();
                     return;
                 }
+#ifdef MRV2_PYBIND11
                 bool value = message["value"];
                 if ((!value && pythonPanel) || (value && !pythonPanel))
                     python_panel_cb(nullptr, ui);
+#endif
             }
             else if (c == "Playlist Panel")
             {