diff --git a/src/core/library/query/TrackMetadataBatchQuery.cpp b/src/core/library/query/TrackMetadataBatchQuery.cpp
index 3f43aa52f..f675952f6 100644
--- a/src/core/library/query/TrackMetadataBatchQuery.cpp
+++ b/src/core/library/query/TrackMetadataBatchQuery.cpp
@@ -63,6 +63,7 @@ bool TrackMetadataBatchQuery::OnRun(Connection& db) {
         if (i < this->trackIds.size() - 1) {
             idList += ",";
         }
+        ++i;
     }
 
     std::string query = tracks::kAllMetadataQueryByIdBatch;
diff --git a/src/plugins/httpdatastream/HttpDataStream.cpp b/src/plugins/httpdatastream/HttpDataStream.cpp
index a732c6198..fc43544d3 100755
--- a/src/plugins/httpdatastream/HttpDataStream.cpp
+++ b/src/plugins/httpdatastream/HttpDataStream.cpp
@@ -327,7 +327,7 @@ bool HttpDataStream::Open(const char *rawUri, OpenFlags flags) {
         this->state = Loading;
         downloadThread.reset(new std::thread(&HttpDataStream::ThreadProc, this));
 
-        /* wait until headers have finished */
+        /* wait until we have a few hundred k of data */
         startedContition.wait(lock);
 
         return true;