diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc
index 73c3d00c01..acce858f9f 100644
--- a/gtk2_ardour/plugin_pin_dialog.cc
+++ b/gtk2_ardour/plugin_pin_dialog.cc
@@ -1710,6 +1710,17 @@ PluginPinWidget::add_remove_port_clicked (bool add, ARDOUR::DataType dt)
 		ChanCount ins, outs, src;
 		_pi->configured_io (ins, outs);
 		src = _pi->natural_output_streams ();
+		if (src.get (dt) == 0) {
+			if (!add || ins.get (dt) < out.get (dt)) {
+				return;
+			}
+			int pn = out.get (dt);
+			assert (pn > 0);
+			ChanMapping map (_pi->thru_map ());
+			map.set (dt, pn - 1, pn - 1);
+			_pi->set_thru_map (map);
+			return;
+		}
 		for (uint32_t i = n_before; i < outs.get (dt); ++i) {
 			uint32_t pc = i / src.get (dt);
 			uint32_t pn = i % src.get (dt);
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 7054ff9cb9..c55b804df2 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -468,6 +468,7 @@ else
 STDCPP=
 fi
 
+echo "Stripping symbols and architectures."
 while [ true ] ; do
 	missing=false
 	for file in $APPROOT/MacOS/* $Frameworks/* $Panners/*.dylib $Backends/*.dylib $Surfaces/*.dylib $GTK_ENGINE_DIR/*.dylib ; do
@@ -951,7 +952,7 @@ if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}"; then
 	fi
 fi
 
-if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}" -a -n "$WITH_HARVID"; then
+if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}" -a -n "$WITH_XJADEO"; then
 	#############
 	## Sign Jadeo