diff --git a/HeliosPlus/GameLibraries/SteamGame.cs b/HeliosPlus/GameLibraries/SteamGame.cs
index 2d6cfd2..ffe5d1a 100644
--- a/HeliosPlus/GameLibraries/SteamGame.cs
+++ b/HeliosPlus/GameLibraries/SteamGame.cs
@@ -71,11 +71,19 @@ namespace HeliosPlus.GameLibraries
 
         }
 
-        public uint GameId { get => _steamGameId; }
+        public uint GameId { 
+            get => _steamGameId;
+            set => _steamGameId = value;
+        }
 
-        public SupportedGameLibrary GameLibrary { get => SupportedGameLibrary.Steam; }
+        public SupportedGameLibrary GameLibrary { 
+            get => SupportedGameLibrary.Steam; 
+        }
 
-        public string GameIconPath { get => _steamGameIconPath; }
+        public string GameIconPath { 
+            get => _steamGameIconPath; 
+            set => _steamGameIconPath = value;
+        }
                   
         public bool IsRunning
         {
@@ -147,23 +155,26 @@ namespace HeliosPlus.GameLibraries
             }
         }
 
-        public string GameName { get => _steamGameName; }
+        public string GameName { 
+            get => _steamGameName; 
+            set => _steamGameName = value;
+        }
 
-        public string GamePath { get => _steamGamePath; }
+        public string GamePath { 
+            get => _steamGamePath;
+            set => _steamGamePath = value;
+        }
 
         public bool CopyTo(SteamGame steamGame)
         {
             if (!(steamGame is SteamGame))
                 return false;
 
-            // Copy all the shortcut data over to the other Shortcut
+            // Copy all the game data over to the other game
             steamGame.GameIconPath = GameIconPath;
             steamGame.GameId = GameId;
             steamGame.GameName = GameName;
             steamGame.GamePath = GamePath;
-            steamGame.IsRunning = IsRunning;
-            steamGame.IsUpdating = IsUpdating;
-
             return true;
         }
 
diff --git a/HeliosPlus/GameLibraries/SteamLibrary.cs b/HeliosPlus/GameLibraries/SteamLibrary.cs
index e42d610..7cba638 100644
--- a/HeliosPlus/GameLibraries/SteamLibrary.cs
+++ b/HeliosPlus/GameLibraries/SteamLibrary.cs
@@ -16,7 +16,7 @@ namespace HeliosPlus.GameLibraries
     {
         #region Class Variables
         // Common items to the class
-        private static List<SteamGame> _allSteamGames = null;
+        private static List<SteamGame> _allSteamGames = new List<SteamGame>();
         private static string steamAppIdRegex = @"/^[0-9A-F]{1,10}$";
         private static string _steamExe;
         private static string _steamPath;
diff --git a/HeliosPlus/UIForms/ShortcutForm.cs b/HeliosPlus/UIForms/ShortcutForm.cs
index f969d3a..fd8f8bb 100644
--- a/HeliosPlus/UIForms/ShortcutForm.cs
+++ b/HeliosPlus/UIForms/ShortcutForm.cs
@@ -439,11 +439,11 @@ namespace HeliosPlus.UIForms
                 _shortcutToEdit.OriginalIconPath = (from steamGame in SteamLibrary.AllInstalledGames where steamGame.GameId == _shortcutToEdit.GameAppId select steamGame.GameIconPath).First();
                 _shortcutToEdit.GameLibrary = SupportedGameLibrary.Steam;
             }
-            else if (txt_game_launcher.Text == SupportedGameLibrary.Uplay.ToString())
+            /*else if (txt_game_launcher.Text == SupportedGameLibrary.Uplay.ToString())
             {
                 _shortcutToEdit.OriginalIconPath = (from uplayGame in UplayLibrary.AllInstalledGames where uplayGame.GameId == _shortcutToEdit.GameAppId select uplayGame.GameIconPath).First();
                 _shortcutToEdit.GameLibrary = SupportedGameLibrary.Uplay;
-            }
+            }*/
             else if (rb_standalone.Checked)
                 _shortcutToEdit.Category = ShortcutCategory.Application;