diff --git a/src/resolvers/libraryresolver.cpp b/src/resolvers/libraryresolver.cpp
index bb82bdc31..30b846ca1 100644
--- a/src/resolvers/libraryresolver.cpp
+++ b/src/resolvers/libraryresolver.cpp
@@ -14,7 +14,8 @@ using boost::scoped_ptr;
 
 LibraryResolver::LibraryResolver(LibraryBackendInterface* backend, QObject* parent)
     : Resolver(parent),
-      backend_(backend) {
+      backend_(backend),
+      next_id_(0) {
 }
 
 int LibraryResolver::ResolveSong(const Song& song) {
diff --git a/src/resolvers/libraryresolver.h b/src/resolvers/libraryresolver.h
index db947d350..947890025 100644
--- a/src/resolvers/libraryresolver.h
+++ b/src/resolvers/libraryresolver.h
@@ -17,7 +17,7 @@ class LibraryResolver : public Resolver {
   int ResolveSong(const Song& song);
 
  signals:
-  void ResolveFinished(int id, SongList songs);
+  void ResolveFinished(int id, const SongList& songs);
 
  private slots:
   void QueryFinished();