diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc
index 5147ad90b0..2f5dcdc1b9 100644
--- a/libs/backends/jack/jack_session.cc
+++ b/libs/backends/jack/jack_session.cc
@@ -140,8 +140,8 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/,
 		pos->ticks_per_beat = Temporal::ticks_per_beat;
 		pos->beats_per_minute = metric.tempo().note_types_per_minute();
 
-		double current_tick = tempo_map.quarter_note_at_bbt_rt (bbt) / 4 * pos->beat_type * pos->ticks_per_beat;
-		pos->bar_start_tick = current_tick - ((pos->beat - 1) * pos->ticks_per_beat + pos->tick);
+		Beats current_tick = metric.quarters_at (bbt) / 4 * pos->beat_type * pos->ticks_per_beat;
+		pos->bar_start_tick = current_tick.to_ticks() - ((pos->beat - 1) * pos->ticks_per_beat + pos->tick);
 
 		pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
 
diff --git a/libs/evoral/ControlList.cc b/libs/evoral/ControlList.cc
index 7984db6df8..0cc9a49086 100644
--- a/libs/evoral/ControlList.cc
+++ b/libs/evoral/ControlList.cc
@@ -1643,7 +1643,7 @@ ControlList::rt_safe_earliest_event_discrete_unlocked (timepos_t const & start_t
  * \return true if event is found (and \a x and \a y are valid).
  */
 bool
-ControlList::rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start_time, Temporal::timepos_t & x, double& y, bool inclusive, timepos_t const & min_x_delta) const
+ControlList::rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start_time, Temporal::timepos_t & x, double& y, bool inclusive, Temporal::timecnt_t min_x_delta) const
 {
 	timepos_t start = start_time;
 
diff --git a/libs/evoral/evoral/ControlList.h b/libs/evoral/evoral/ControlList.h
index 48655ca244..02e505d5e8 100644
--- a/libs/evoral/evoral/ControlList.h
+++ b/libs/evoral/evoral/ControlList.h
@@ -308,7 +308,7 @@ public:
 	double unlocked_eval (Temporal::timepos_t const & x) const;
 
 	bool rt_safe_earliest_event_discrete_unlocked (Temporal::timepos_t const & start, Temporal::timepos_t & x, double& y, bool inclusive) const;
-	bool rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start, Temporal::timepos_t & x, double& y, bool inclusive, Temporal::timepos_t min_x_delta = Temporal::timepos_t ()) const;
+	bool rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start, Temporal::timepos_t & x, double& y, bool inclusive, Temporal::timecnt_t min_x_delta = Temporal::timecnt_t ()) const;
 
 	void create_curve();
 	void destroy_curve();
diff --git a/libs/pbd/pbd/rcu.h b/libs/pbd/pbd/rcu.h
index 8d544a8176..af257e83be 100644
--- a/libs/pbd/pbd/rcu.h
+++ b/libs/pbd/pbd/rcu.h
@@ -146,12 +146,12 @@ class /*LIBPBD_API*/ SerializedRCUManager : public RCUManager<T>
 public:
 	SerializedRCUManager(T* new_rcu_value)
 		: RCUManager<T>(new_rcu_value)
-		, current_write_old (0)
+		, _current_write_old (0)
 	{
 	}
 
 	void init (boost::shared_ptr<T> new_rcu_value) {
-		assert  (*RCUManager<T>::x.m_rcu_value == boost::shared_ptr<T> ());
+		assert  (*RCUManager<T>::x.rcu_value == boost::shared_ptr<T> ());
 
 		boost::shared_ptr<T>* new_spp = new boost::shared_ptr<T> (new_rcu_value);
 		g_atomic_pointer_set (&RCUManager<T>::x.gptr, new_spp);
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index bd5befb5b9..22b7d6be2e 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -1305,7 +1305,7 @@ OSC::osc_toggle_roll (bool ret2strt)
 	} else {
 
 		if (session->get_play_loop() && Config->get_loop_is_mode()) {
-			session->request_locate (session->locations()->auto_loop_location()->start(), MustRoll);
+			session->request_locate (session->locations()->auto_loop_location()->start().samples(), MustRoll);
 		} else {
 			session->request_roll (TRS_UI);
 		}
diff --git a/libs/surfaces/websockets/feedback.cc b/libs/surfaces/websockets/feedback.cc
index 9c7e92c87b..3a854bb73e 100644
--- a/libs/surfaces/websockets/feedback.cc
+++ b/libs/surfaces/websockets/feedback.cc
@@ -231,7 +231,7 @@ ArdourFeedback::observe_transport ()
 	                                 boost::bind<void> (RecordStateObserver (), this), event_loop ());
 
 #warning NUTEMPO this is not right. the actual map can change. static signal?
-	Temporal::TempoMap::use()->Changed.connect (_signal_connections, MISSING_INVALIDATOR,
+	Temporal::TempoMap::use()->Changed.connect (_transport_connections, MISSING_INVALIDATOR,
 	                                            boost::bind<void> (TempoObserver (), this), event_loop ());
 }
 
diff --git a/libs/temporal/temporal/beats.h b/libs/temporal/temporal/beats.h
index 7c98ceeeaf..26efcef8a4 100644
--- a/libs/temporal/temporal/beats.h
+++ b/libs/temporal/temporal/beats.h
@@ -88,8 +88,8 @@ public:
 
 		// Work with positive beats and ticks to normalize
 		const int32_t sign  = _beats < 0 ? -1 : _ticks < 0 ? -1 : 1;
-		int32_t       beats = abs(_beats);
-		int32_t       ticks = abs(_ticks);
+		int32_t       beats = ::abs(_beats);
+		int32_t       ticks = ::abs(_ticks);
 
 		// Fix ticks greater than 1 beat
 		while (ticks >= PPQN) {