diff --git a/mixer/src/Module_Parameter_Editor.C b/mixer/src/Module_Parameter_Editor.C
index 8029d46..26fc1dd 100644
--- a/mixer/src/Module_Parameter_Editor.C
+++ b/mixer/src/Module_Parameter_Editor.C
@@ -325,8 +325,7 @@ Module_Parameter_Editor::make_controls ( void )
 
         controls_by_port[i] = w;
 
-        w->tooltip( p->osc_path() );
-
+        w->copy_tooltip( p->osc_path() );
 
         _callback_data.push_back( callback_data( this, i ) );
 
diff --git a/nonlib/OSC/Endpoint.C b/nonlib/OSC/Endpoint.C
index ae4c25b..e198c18 100644
--- a/nonlib/OSC/Endpoint.C
+++ b/nonlib/OSC/Endpoint.C
@@ -89,7 +89,7 @@ namespace OSC
     Signal::rename ( const char *path )
     {
         char *new_path;
-        asprintf( &new_path, "%s%s", _endpoint->name(), path );
+        asprintf( &new_path, "%s%s", _endpoint->name() ? _endpoint->name() : "", path );
 
         DMESSAGE( "Renaming signal %s to %s", this->path(), new_path );
 
@@ -962,7 +962,7 @@ namespace OSC
     Endpoint::add_signal ( const char *path, Signal::Direction dir, float min, float max, float default_value, signal_handler handler, void *user_data )
     {
         char *s;
-        asprintf( &s, "%s%s", name(), path );
+        asprintf( &s, "%s%s", name() ? name() : "", path );
 
         Signal *o = new Signal( s, dir );