diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
index 5f99f16..6da9703 100644
--- a/src/runtime/kwalletd/kwalletd.cpp
+++ b/src/runtime/kwalletd/kwalletd.cpp
@@ -175,8 +175,7 @@ void KWalletD::connectToScreenSaver()
     screensaver = new QDBusInterface("org.freedesktop.ScreenSaver",
         "/ScreenSaver", "org.freedesktop.ScreenSaver");
     if (!screensaver->isValid()) {
-        qDebug() << "Service org.freedesktop.ScreenSaver not found. Retrying "
-                    "in 10 seconds...";
+        qDebug() << "Service org.freedesktop.ScreenSaver not found. Retrying in 10 seconds...";
         // keep attempting every 10 seconds
         QTimer::singleShot(10000, this, SLOT(connectToScreenSaver()));
     }
@@ -329,7 +328,7 @@ int KWalletD::open(const QString& wallet, qlonglong wId, const QString& appid)
         return -1;
     }
 
-    if (!QRegExp(QStringLiteral("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\."
+    if (!QRegExp(QString::fromLatin1("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\."
                  "\\+\\_\\s]+$")).exactMatch(wallet)) {
         return -1;
     }
@@ -361,7 +360,7 @@ int KWalletD::openAsync(const QString& wallet, qlonglong wId,
         return -1;
     }
 
-    if (!QRegExp(QStringLiteral("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\."
+    if (!QRegExp(QString::fromLatin1("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\."
                  "\\+\\_\\s]+$")).exactMatch(wallet)) {
         return -1;
     }
@@ -1862,7 +1861,7 @@ int KWalletD::pamOpen(
         return -1;
     }
 
-    if (!QRegExp(QStringLiteral("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\."
+    if (!QRegExp(QString::fromLatin1("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\."
                  "\\+\\_\\s]+$")).exactMatch(wallet)) {
         return -1;
     }
diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp
index db8d55c..a48de08 100644
--- a/src/runtime/kwalletd/main.cpp
+++ b/src/runtime/kwalletd/main.cpp
@@ -90,18 +90,21 @@ static int waitForEnvironment()
     }
     printf("kwalletd5: client connected\n");
 
-    char str[BSIZE];
-    memset(str, '\0', sizeof(char) * BSIZE);
+    char str[BSIZE] = {'\0'};
 
     int chop = 0;
     FILE *s3 = fdopen(s2, "r");
     while(!feof(s3)) {
         if (fgets(str, BSIZE, s3)) {
             chop = strlen(str) - 1;
-            str[chop] = '\0';
+            if (str[chop] == '\n') {
+                str[chop] = '\0';
+            }
             putenv(strdup(str));
         }
     }
+    fclose(s3);
+
     printf("kwalletd5: client disconnected\n");
     close(socketfd);
     return 1;