diff --git a/QueryMaster/QueryMaster.csproj b/QueryMaster/QueryMaster.csproj
index fa6f23d..9b8871a 100644
--- a/QueryMaster/QueryMaster.csproj
+++ b/QueryMaster/QueryMaster.csproj
@@ -38,13 +38,17 @@
     <DocumentationFile>bin\Release\QueryMaster.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\Solution\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Ionic.BZip2, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>ExternalBin\Ionic.BZip2.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>ExternalBin\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\Solution\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -184,6 +188,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram1.cd" />
+    <None Include="packages.config" />
     <None Include="QueryMaster.license">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/QueryMaster/packages.config b/QueryMaster/packages.config
new file mode 100644
index 0000000..f4c767b
--- /dev/null
+++ b/QueryMaster/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DotNetZip" version="1.10.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Squad.Admin.Console/Forms/frmMainConsole.cs b/Squad.Admin.Console/Forms/frmMainConsole.cs
index b4785c8..fc511ad 100644
--- a/Squad.Admin.Console/Forms/frmMainConsole.cs
+++ b/Squad.Admin.Console/Forms/frmMainConsole.cs
@@ -298,11 +298,21 @@ private void EnableLoginControls(bool enable)
         /// </summary>
         private void LoadAutocompleteCommands()
         {
+            string commandFilePath = AppDomain.CurrentDomain.BaseDirectory + "Assets\\Commands.dat";
+            List<string> commands;
             AutoCompleteStringCollection commandList = new AutoCompleteStringCollection();
 
-            string[] commands = File.ReadAllLines(AppDomain.CurrentDomain.BaseDirectory + "Commands.dat");
+            try
+            {
+                commands = new List<string>(File.ReadAllLines(commandFilePath));
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Error occurred trying to open the Commands file!\r\nError: " + ex.Message, "Exception", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                return;
+            }
 
-            for (int i = 0; i < commands.Length; i++)
+            for (int i = 0; i < commands.Count; i++)
             {
                 commandList.Add(commands[i].Trim());
             }
@@ -315,10 +325,11 @@ private void LoadAutocompleteCommands()
         /// </summary>
         private void LoadContextMenuItems()
         {
+            string reasonsFilePath = AppDomain.CurrentDomain.BaseDirectory + "Assets\\MenuReasons.xml";
             // Load the xml file with the menu reasons
             try
             {
-                menuReasons = XDocument.Load(@"MenuReasons.xml");
+                menuReasons = XDocument.Load(reasonsFilePath);
             }
             catch(Exception ex)
             {
diff --git a/Squad.Admin.Console/Squad.Admin.Console.csproj b/Squad.Admin.Console/Squad.Admin.Console.csproj
index 20af2de..f127cd2 100644
--- a/Squad.Admin.Console/Squad.Admin.Console.csproj
+++ b/Squad.Admin.Console/Squad.Admin.Console.csproj
@@ -62,10 +62,10 @@
     <ManifestKeyFile>Squad.Admin.Console_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -140,7 +140,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="Assets\Commands.dat" />
+    <None Include="Assets\Commands.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -170,7 +172,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\MenuReasons.xml" />
+    <None Include="Assets\MenuReasons.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="Assets\settings.png" />
     <Content Include="Assets\Squad.ico" />
     <Content Include="Assets\SquadLoginBanner.png" />