diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index cc6e3b443a..4c8b1b3fc8 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -388,11 +388,13 @@ AudioEngine::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* a
 	ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
 }
 
+#ifdef HAVE_JACK_NEW_LATENCY
 void
 AudioEngine::_latency_callback (jack_latency_callback_mode_t mode, void* arg)
 {
 	return static_cast<AudioEngine *> (arg)->jack_latency_callback (mode);
 }
+#endif
 
 void
 AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
@@ -618,6 +620,7 @@ AudioEngine::jack_sample_rate_callback (pframes_t nframes)
 	return 0;
 }
 
+#ifdef HAVE_JACK_NEW_LATENCY
 void
 AudioEngine::jack_latency_callback (jack_latency_callback_mode_t mode)
 {
@@ -625,6 +628,7 @@ AudioEngine::jack_latency_callback (jack_latency_callback_mode_t mode)
                 _session->update_latency (mode == JackPlaybackLatency);
         }
 }
+#endif
 
 int
 AudioEngine::_bufsize_callback (pframes_t nframes, void *arg)
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 2fe9eb7fd1..a980b3f446 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3690,7 +3690,7 @@ Route::update_port_latencies (const PortSet& operands, const PortSet& feeders, b
                 
                 p->set_latency_range (all_connections, playback);
                 
-                DEBUG_TRACE (DEBUG::Latency, string_compose ("Port %1 %5 latency range %2 .. %3 + %4\n",
+                DEBUG_TRACE (DEBUG::Latency, string_compose ("Port %1 %5 latency range %2 .. %3 (including route latency of %4)\n",
                                                              p->name(),
                                                              all_connections.min,
                                                              all_connections.max,