diff --git a/doomsday/sdk/libcore/include/de/filesys/packageloader.h b/doomsday/sdk/libcore/include/de/filesys/packageloader.h
index 7a5369de4c..87a28b8587 100644
--- a/doomsday/sdk/libcore/include/de/filesys/packageloader.h
+++ b/doomsday/sdk/libcore/include/de/filesys/packageloader.h
@@ -63,7 +63,7 @@ class DENG2_PUBLIC PackageLoader
     /// Errors during reactions to loading a package. @ingroup errors
     DENG2_ERROR(PostLoadError);
 
-    typedef QMap<String, Package *> LoadedPackages;
+    typedef QHash<String, Package *> LoadedPackages;
 
     /**
      * Utility for dealing with space-separated lists of identifiers.
diff --git a/doomsday/sdk/libcore/src/filesys/packageloader.cpp b/doomsday/sdk/libcore/src/filesys/packageloader.cpp
index c237530a9f..fdfbd91c08 100644
--- a/doomsday/sdk/libcore/src/filesys/packageloader.cpp
+++ b/doomsday/sdk/libcore/src/filesys/packageloader.cpp
@@ -353,7 +353,7 @@ void PackageLoader::unloadAll()
 
     while(!d->loaded.isEmpty())
     {
-        unload(d->loaded.firstKey());
+        unload(d->loaded.begin().key());
     }
 }