diff --git a/Update.cs b/Update.cs
index f55776cb..4bea6d36 100644
--- a/Update.cs
+++ b/Update.cs
@@ -7,13 +7,16 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 namespace VRCX
 {
-    class Update
+    internal class Update
     {
         public static void Check()
         {
+            if (Process.GetProcessesByName("VRCX_Setup").Length > 0)
+                Environment.Exit(0);
             if (File.Exists(Path.Combine(Program.AppDataDirectory, "VRCX_Setup.exe")))
                 File.Delete(Path.Combine(Program.AppDataDirectory, "VRCX_Setup.exe"));
             if (File.Exists(Path.Combine(Program.AppDataDirectory, "update.exe")))
@@ -24,14 +27,17 @@ namespace VRCX
         {
             try
             {
-                if (!File.Exists(Path.Combine(Program.AppDataDirectory, "update.exe")))
-                    return;
                 File.Move(Path.Combine(Program.AppDataDirectory, "update.exe"), Path.Combine(Program.AppDataDirectory, "VRCX_Setup.exe"));
-                System.Diagnostics.Process VRCXProcess = new System.Diagnostics.Process();
-                VRCXProcess.StartInfo.FileName = Path.Combine(Program.AppDataDirectory, "VRCX_Setup.exe");
-                VRCXProcess.StartInfo.Arguments = "/S";
+                var VRCXProcess = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = Path.Combine(Program.AppDataDirectory, "VRCX_Setup.exe"),
+                        Arguments = "/S"
+                    }
+                };
                 VRCXProcess.Start();
-                System.Environment.Exit(0);
+                Environment.Exit(0);
             }
             catch (Exception e)
             {
@@ -39,4 +45,4 @@ namespace VRCX
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/html/src/app.js b/html/src/app.js
index 521670fb..479f898a 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -274,6 +274,7 @@ speechSynthesis.getVoices();
         ara: 'العربية',
         ron: 'Română',
         vie: 'Tiếng Việt',
+        ukr: 'украї́нська',
         ase: 'American Sign Language',
         bfi: 'British Sign Language',
         dse: 'Dutch Sign Language',
@@ -306,6 +307,7 @@ speechSynthesis.getVoices();
         ara: 'ae',
         ron: 'ro',
         vie: 'vn',
+        ukr: 'ua',
         ase: 'us',
         bfi: 'gb',
         dse: 'nl',
@@ -8998,7 +9000,7 @@ speechSynthesis.getVoices();
                 var text = `SpawnEmoji ${this.photonEmojis[eventData.Data]}`;
             } else {
                 var eventVrc = '';
-                if (eventData.Data) {
+                if (eventData.Data.length > 0) {
                     eventVrc = ` ${JSON.stringify(eventData.Data).replace(
                         /"([^(")"]+)":/g,
                         '$1:'