diff --git a/src/playlist/cue/CueParser.cxx b/src/playlist/cue/CueParser.cxx
index bb2f107d8..4e79027a4 100644
--- a/src/playlist/cue/CueParser.cxx
+++ b/src/playlist/cue/CueParser.cxx
@@ -43,7 +43,7 @@ cue_next_word(std::string_view &src) noexcept
 static std::string_view
 cue_next_quoted(std::string_view &src) noexcept
 {
-	assert(src.data()[-1] == '"');
+	assert(src[-1] == '"');
 
 	auto end = src.find('"');
 	if (end == src.npos)
diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
index 1f361506b..2538baf17 100644
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -106,7 +106,7 @@ embcue_playlist_open_uri(const char *uri,
 
 	playlist->cuesheet = std::move(extract_cuesheet.cuesheet);
 
-	playlist->next = &playlist->cuesheet[0];
+	playlist->next = playlist->cuesheet.data();
 	playlist->parser = std::make_unique<CueParser>();
 
 	return playlist;