diff --git a/src/lib/base/Unicode.cpp b/src/lib/base/Unicode.cpp
index 233b57ca3..cc6f48199 100644
--- a/src/lib/base/Unicode.cpp
+++ b/src/lib/base/Unicode.cpp
@@ -18,7 +18,9 @@ inline static uint16_t decode16(const uint8_t *n, bool byteSwapped)
   {
     uint8_t n8[2];
     uint16_t n16;
-  } c;
+  };
+  x16 c;
+
   if (byteSwapped) {
     c.n8[0] = n[1];
     c.n8[1] = n[0];
@@ -35,7 +37,8 @@ inline static uint32_t decode32(const uint8_t *n, bool byteSwapped)
   {
     uint8_t n8[4];
     uint32_t n32;
-  } c;
+  };
+  x32 c;
   if (byteSwapped) {
     c.n8[0] = n[3];
     c.n8[1] = n[2];
@@ -216,7 +219,7 @@ std::string Unicode::UTF8ToText(const std::string &src, bool *errors)
   return text;
 }
 
-std::string Unicode::UCS2ToUTF8(const std::string &src, bool *errors)
+std::string Unicode::UCS2ToUTF8(const std::string_view &src, bool *errors)
 {
   // default to success
   resetError(errors);
@@ -563,29 +566,29 @@ uint32_t Unicode::fromUTF8(const uint8_t *&data, uint32_t &n)
     break;
 
   case 2:
-    c = ((static_cast<uint32_t>(data[0]) & 0x1f) << 6) | ((static_cast<uint32_t>(data[1]) & 0x3f));
+    c = ((static_cast<uint32_t>(data[0]) & 0x1f) << 6) | (static_cast<uint32_t>(data[1]) & 0x3f);
     break;
 
   case 3:
     c = ((static_cast<uint32_t>(data[0]) & 0x0f) << 12) | ((static_cast<uint32_t>(data[1]) & 0x3f) << 6) |
-        ((static_cast<uint32_t>(data[2]) & 0x3f));
+        (static_cast<uint32_t>(data[2]) & 0x3f);
     break;
 
   case 4:
     c = ((static_cast<uint32_t>(data[0]) & 0x07) << 18) | ((static_cast<uint32_t>(data[1]) & 0x3f) << 12) |
-        ((static_cast<uint32_t>(data[2]) & 0x3f) << 6) | ((static_cast<uint32_t>(data[3]) & 0x3f));
+        ((static_cast<uint32_t>(data[2]) & 0x3f) << 6) | (static_cast<uint32_t>(data[3]) & 0x3f);
     break;
 
   case 5:
     c = ((static_cast<uint32_t>(data[0]) & 0x03) << 24) | ((static_cast<uint32_t>(data[1]) & 0x3f) << 18) |
         ((static_cast<uint32_t>(data[2]) & 0x3f) << 12) | ((static_cast<uint32_t>(data[3]) & 0x3f) << 6) |
-        ((static_cast<uint32_t>(data[4]) & 0x3f));
+        (static_cast<uint32_t>(data[4]) & 0x3f);
     break;
 
   case 6:
     c = ((static_cast<uint32_t>(data[0]) & 0x01) << 30) | ((static_cast<uint32_t>(data[1]) & 0x3f) << 24) |
         ((static_cast<uint32_t>(data[2]) & 0x3f) << 18) | ((static_cast<uint32_t>(data[3]) & 0x3f) << 12) |
-        ((static_cast<uint32_t>(data[4]) & 0x3f) << 6) | ((static_cast<uint32_t>(data[5]) & 0x3f));
+        ((static_cast<uint32_t>(data[4]) & 0x3f) << 6) | (static_cast<uint32_t>(data[5]) & 0x3f);
     break;
 
   default:
diff --git a/src/lib/base/Unicode.h b/src/lib/base/Unicode.h
index 92eade1d4..8fbe7af5f 100644
--- a/src/lib/base/Unicode.h
+++ b/src/lib/base/Unicode.h
@@ -74,7 +74,7 @@ public:
   Convert from UCS-2 to UTF-8.  If errors is not nullptr then *errors is
   set to true iff any character could not be decoded.
   */
-  static std::string UCS2ToUTF8(const std::string &, bool *errors = nullptr);
+  static std::string UCS2ToUTF8(const std::string_view &, bool *errors = nullptr);
 
   //! Convert from UCS-4 to UTF-8
   /*!