diff --git a/private/serviceprovider_p.h b/private/serviceprovider_p.h
index 3ce1ba490..441155c92 100644
--- a/private/serviceprovider_p.h
+++ b/private/serviceprovider_p.h
@@ -26,7 +26,7 @@
 
 class QSignalMapper;
 
-namespace Plasma 
+namespace Plasma
 {
 
 class AuthorizationRule;
@@ -65,7 +65,7 @@ class ServiceProvider : public Jolie::AbstractAdaptor
         QString                           m_providerName;
 
         QMap<ServiceJob*, Jolie::Message> m_messageMap;
-        QMap<QString, QByteArray>         m_tokens;
+        QMap<QByteArray, QByteArray>         m_tokens;
         QMap<QByteArray, int>             m_descriptorMap;
         QList<Jolie::Message>             m_messagesPendingAuthorization;
 
diff --git a/tests/plasmoidpackagetest.cpp b/tests/plasmoidpackagetest.cpp
index 713c4006a..90039a4fd 100644
--- a/tests/plasmoidpackagetest.cpp
+++ b/tests/plasmoidpackagetest.cpp
@@ -51,10 +51,10 @@ void PlasmoidPackageTest::cleanup()
     // Clean things up.
     QDir local(QDir::homePath() + QLatin1String("/.kde-unit-test/packageRoot"));
     foreach (const QString &dir, local.entryList(QDir::Dirs)) {
-        removeDir(QLatin1String("packageRoot/" + dir.toLatin1() + "/contents/code"));
-        removeDir(QLatin1String("packageRoot/" + dir.toLatin1() + "/contents/images"));
-        removeDir(QLatin1String("packageRoot/" + dir.toLatin1() + "/contents"));
-        removeDir(QLatin1String("packageRoot/" + dir.toLatin1()));
+        removeDir(QLatin1String("packageRoot/") + dir.toLatin1() + "/contents/code");
+        removeDir(QLatin1String("packageRoot/") + dir.toLatin1() + "/contents/images");
+        removeDir(QLatin1String("packageRoot/") + dir.toLatin1() + "/contents");
+        removeDir(QLatin1String("packageRoot/") + dir.toLatin1());
     }
 
     QDir().rmpath(QDir::homePath() + "/.kde-unit-test/packageRoot");
@@ -108,7 +108,7 @@ void PlasmoidPackageTest::createTestPackage(const QString &packageName)
     file.flush();
     file.close();
 
-    // Now we have a minimal plasmoid package which is valid. Let's add some 
+    // Now we have a minimal plasmoid package which is valid. Let's add some
     // files to it for test purposes.
 
     // Create the images dir.
@@ -306,7 +306,7 @@ void PlasmoidPackageTest::createAndInstallPackage()
 {
     QString plasmoid("plasmoid_to_package");
     createTestPackage(plasmoid);
-    
+
     QString packagePath = mPackageRoot + '/' + "package.zip";
     Plasma::PackageMetadata metadata(
         QString(KDESRCDIR) + "/packagemetadatatest.desktop");
@@ -323,7 +323,7 @@ void PlasmoidPackageTest::createAndInstallPackage()
     const KArchiveEntry *contentsEntry = dir->entry("contents");
     QVERIFY(contentsEntry);
     QVERIFY(contentsEntry->isDirectory());
-    const KArchiveDirectory *contents = 
+    const KArchiveDirectory *contents =
         static_cast<const KArchiveDirectory *>(contentsEntry);
     QVERIFY(contents->entry("code"));
     QVERIFY(contents->entry("images"));