diff --git a/src/mpd.c b/src/mpd.c
index 7bd77fa0..d68dc0b4 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -4559,7 +4559,7 @@ int mpd_init(void)
       ret = evhttp_bind_socket(evhttpd, http_addr, http_port);
       if (ret < 0)
 	{
-	  DPRINTF(E_FATAL, L_MPD, "Could not bind HTTP artwork server at %s:%d\n", http_addr, port);
+	  DPRINTF(E_FATAL, L_MPD, "Could not bind HTTP artwork server at %s:%d\n", http_addr, http_port);
 
 	  goto bind_fail;
 	}
diff --git a/src/queue.c b/src/queue.c
index 44a5941e..cca6468d 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -576,6 +576,10 @@ queue_new_byindex(struct queue *queue, unsigned int index, unsigned int count, c
       qii->shuffle_prev = qii;
 
       queue_add(qi, qii);
+
+      // queue_add(...) changes the queue item-id, reset the item-id to the original value
+      qii->item_id = item->item_id;
+
       i++;
     }