diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index e86e500ed9..05b174eb8a 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -128,6 +128,7 @@ Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& impo
 		const DataType type = SMFSource::safe_midi_file_extension (import_file_path) ? DataType::MIDI : DataType::AUDIO;
 		string filepath;
 
+		// XXX - always import to session dir?
 		switch (type) {
 		  case DataType::MIDI:
 			filepath = new_midi_source_path (basename);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index e342389723..52ad52cc17 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -4334,6 +4334,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
 	for (uint32_t chan_n = 0; chan_n < diskstream_channels.n_audio(); ++chan_n) {
 
 		string base_name = string_compose ("%1-%2-bounce", playlist->name(), chan_n);
+		// XXX - always use session-folder for bounce ?
 		string path = new_audio_source_path (legal_playlist_name, diskstream_channels.n_audio(), chan_n, false, true);
 		
 		if (path.empty()) {