diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index b121e1a9b8..9c81a7ba0b 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -401,7 +401,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
 
 	PropertyList plist;
 
-	plist.add (Properties::start, 0);
+	plist.add (Properties::start, timepos_t (0));
 	plist.add (Properties::length, srcs[0]->length());
 	plist.add (Properties::name, region_name);
 	plist.add (Properties::whole_file, true);
diff --git a/libs/ardour/import_pt.cc b/libs/ardour/import_pt.cc
index b029b017df..a3e9fff188 100644
--- a/libs/ardour/import_pt.cc
+++ b/libs/ardour/import_pt.cc
@@ -312,8 +312,8 @@ Session::import_pt_rest (PTFFormat& ptf)
 						struct ptflookup rp;
 						PropertyList plist;
 
-						plist.add (ARDOUR::Properties::start, a->sampleoffset);
-						plist.add (ARDOUR::Properties::position, 0);
+						plist.add (ARDOUR::Properties::start, timepos_t (a->sampleoffset));
+						plist.add (ARDOUR::Properties::position, timepos_t (0));
 						plist.add (ARDOUR::Properties::length, a->length);
 						plist.add (ARDOUR::Properties::name, a->name);
 						plist.add (ARDOUR::Properties::layer, 0);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 532e944b87..856ac180f1 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -6107,6 +6107,8 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
 
 	if (!itt.cancel) {
 
+		PropertyList plist;
+
 		time_t now;
 		struct tm* xnow;
 		time (&now);
@@ -6119,17 +6121,16 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
 			if (afs) {
 				afs->update_header (position, *xnow, now);
 				afs->flush_header ();
+				plist.add (Properties::start, timepos_t (0));
 			} else if ((ms = boost::dynamic_pointer_cast<MidiSource>(*src))) {
 				Source::Lock lock(ms->mutex());
 				ms->mark_streaming_write_completed(lock);
-			}
+				plist.add (Properties::start, timepos_t (Beats()));
+		}
 		}
 
 		/* construct a whole-file region to represent the bounced material */
 
-		PropertyList plist;
-
-		plist.add (Properties::start, 0);
 		plist.add (Properties::whole_file, true);
 		plist.add (Properties::length, len); //ToDo: in nutempo, if the Range is snapped to bbt, this should be in bbt (?)
 		plist.add (Properties::name, region_name_from_path (srcs.front()->name(), true));
diff --git a/libs/ardour/test/audio_region_test.cc b/libs/ardour/test/audio_region_test.cc
index 2eee17789f..fd623ca828 100644
--- a/libs/ardour/test/audio_region_test.cc
+++ b/libs/ardour/test/audio_region_test.cc
@@ -59,7 +59,7 @@ AudioRegionTest::setUp ()
 	s->write (staircase, signal_length);
 
 	PropertyList plist;
-	plist.add (Properties::start, 0);
+	plist.add (Properties::start, timepos_t (0));
 	plist.add (Properties::length, 100);
 	for (int i = 0; i < 16; ++i) {
 		_r[i] = RegionFactory::create (_source, plist);