diff --git a/src/backend/bittorrent/bt_backend.c b/src/backend/bittorrent/bt_backend.c
index 44439093fa..6f2552d700 100644
--- a/src/backend/bittorrent/bt_backend.c
+++ b/src/backend/bittorrent/bt_backend.c
@@ -326,10 +326,7 @@ bt_playvideo(const char *url, media_pipe_t *mp,
   torrent_retain(to);
   hts_mutex_unlock(&bittorrent_mutex);
 
-  video_args_t va = *va0;
-  va.canonical_url = newurl;
-
-  event_t *e = backend_play_video(newurl, mp, errbuf, errlen, vq, vsl, &va);
+  event_t *e = backend_play_video(newurl, mp, errbuf, errlen, vq, vsl, va0);
 
   hts_mutex_lock(&bittorrent_mutex);
   torrent_release(to);
diff --git a/src/ecmascript/es_string.c b/src/ecmascript/es_string.c
index 24c18df4a3..0f31de6836 100644
--- a/src/ecmascript/es_string.c
+++ b/src/ecmascript/es_string.c
@@ -116,7 +116,9 @@ es_utf8_from_bytes_duk(duk_context *duk)
 
   const char *csname = duk_safe_to_string(duk, 1);
 
-  if(!strcasecmp(csname, "utf-8") || !strcasecmp(csname, "utf8")) {
+  if(!strcasecmp(csname, "\"utf-8\"") ||
+     !strcasecmp(csname, "utf-8") ||
+     !strcasecmp(csname, "utf8")) {
 
     duk_push_lstring(duk, bytes, size);
     const char *str = duk_require_string(duk, -1);