diff --git a/.gitignore b/.gitignore
index cefdb27..a5307ee 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 Vagrant/.vagrant/*
+Vagrant/vagrant_build.log
 Packer/packer_cache/*
+Packer/packer_build.log
 Boxes/*
 .DS_Store
diff --git a/Packer/scripts/compile-dotnet-assemblies.bat b/Packer/scripts/compile-dotnet-assemblies.bat
index 14f81aa..2c0fe0d 100755
--- a/Packer/scripts/compile-dotnet-assemblies.bat
+++ b/Packer/scripts/compile-dotnet-assemblies.bat
@@ -3,13 +3,15 @@
 
 if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto 64BIT
 
-%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue
-%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems
+%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue > NUL
+%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems > NUL
 
-exit /b
+exit 0
 
 :64BIT
-%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue
-%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe update /force /queue
-%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems
-%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe executequeueditems
\ No newline at end of file
+%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue > NUL
+%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe update /force /queue > NUL
+%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems > NUL
+%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe executequeueditems > NUL
+
+exit 0
diff --git a/Packer/scripts/set-powerplan.ps1 b/Packer/scripts/set-powerplan.ps1
index 65ee32c..646eba7 100755
--- a/Packer/scripts/set-powerplan.ps1
+++ b/Packer/scripts/set-powerplan.ps1
@@ -1,7 +1,20 @@
 Try {
+  Write-Output "Set power plan to high performance"
+
   $HighPerf = powercfg -l | %{if($_.contains("High performance")) {$_.split()[3]}}
+
+  # $HighPerf cannot be $null, we try activate this power profile with powercfg
+  # 
+  if ($HighPerf -eq $null)
+  {
+    throw "Error: HighPerf is null"
+  }
+
   $CurrPlan = $(powercfg -getactivescheme).split()[3]
+
   if ($CurrPlan -ne $HighPerf) {powercfg -setactive $HighPerf}
+
 } Catch {
   Write-Warning -Message "Unable to set power plan to high performance"
+  Write-Warning $Error[0]
 }
diff --git a/Packer/scripts/unattend.xml b/Packer/scripts/unattend.xml
index f3a6c2d..ea8e759 100755
--- a/Packer/scripts/unattend.xml
+++ b/Packer/scripts/unattend.xml
@@ -34,7 +34,7 @@
     </settings>
     <settings pass="specialize">
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>vagrant-2012</ComputerName>
+            <ComputerName>vagrant-2016</ComputerName>
             <CopyProfile>false</CopyProfile>
         </component>
     </settings>
diff --git a/Packer/scripts/vm-guest-tools.bat b/Packer/scripts/vm-guest-tools.bat
index 18891bc..cd33b74 100755
--- a/Packer/scripts/vm-guest-tools.bat
+++ b/Packer/scripts/vm-guest-tools.bat
@@ -15,7 +15,7 @@ if exist "C:\Users\vagrant\windows.iso" (
 )
 
 if not exist "C:\Windows\Temp\windows.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.5.7/5813279/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/14.1.1/7528167/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
     cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.tar -oC:\Windows\Temp"
     FOR /r "C:\Windows\Temp" %%a in (VMware-tools-windows-*.iso) DO REN "%%~a" "windows.iso"
     rd /S /Q "C:\Program Files (x86)\VMWare"
@@ -31,16 +31,12 @@ goto :done
 
 :virtualbox
 
-:: There needs to be Oracle CA (Certificate Authority) certificates installed in order
-:: to prevent user intervention popups which will undermine a silent installation.
-cmd /c certutil -addstore -f "TrustedPublisher" A:\oracle-cert.cer
-
 if exist "C:\Users\vagrant\VBoxGuestAdditions.iso" (
     move /Y C:\Users\vagrant\VBoxGuestAdditions.iso C:\Windows\Temp
 )
 
 if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.1.28/VBoxGuestAdditions_5.1.28.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.2.4/VBoxGuestAdditions_5.2.4.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
 )
 
 cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox"
diff --git a/Packer/windows_2016.json b/Packer/windows_2016.json
index f7ec057..a8cf8fb 100644
--- a/Packer/windows_2016.json
+++ b/Packer/windows_2016.json
@@ -81,7 +81,7 @@
       "winrm_password": "vagrant",
       "winrm_timeout": "4h",
       "shutdown_command": "a:/sysprep.bat",
-      "guest_os_type": "Windows2012_64",
+      "guest_os_type": "Windows2016_64",
       "guest_additions_mode": "disable",
       "disk_size": 61440,
       "floppy_files": [
diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh
index a30bc52..0c0b95d 100644
--- a/Vagrant/bootstrap.sh
+++ b/Vagrant/bootstrap.sh
@@ -90,7 +90,7 @@ go build
 cd /home/vagrant
 
 # Modify the config to work with config importer
-cat /home/vagrant/osquery-configuration/Endpoints/Windows/osquery.conf  | sed 's#packs/#../packs/#g' | grep -v unwanted-chrome-extensions | grep -v security-tooling-checks | grep -v performance-metrics > /home/vagrant/osquery-configuration/Endpoints/Windows/osquery_to_import.conf
+cat /home/vagrant/osquery-configuration/Endpoints/Windows/osquery.conf  | sed 's#packs/#../packs/#g' | grep -v unwanted-chrome-extensions | grep -v security-tooling-checks | grep -v performance-metrics | grep -v logger_snapshot_event_type > /home/vagrant/osquery-configuration/Endpoints/Windows/osquery_to_import.conf
 # Install configimporter
 echo "Installing configimporter"
 echo "Sleeping for 5"
diff --git a/Vagrant/scripts/download_palantir_wef.ps1 b/Vagrant/scripts/download_palantir_wef.ps1
index 2fa766e..dc71750 100644
--- a/Vagrant/scripts/download_palantir_wef.ps1
+++ b/Vagrant/scripts/download_palantir_wef.ps1
@@ -1,8 +1,5 @@
 # Purpose: Downloads and unzips a copy of the Palantir WEF Github Repo. This includes WEF subscriptions and custom WEF channels.
 
-# GitHub requires TLS 1.2
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
 Write-Host "Downloading and unzipping the Palantir Windows Event Forwarding Repo from Github..."
 
 $wefRepoPath = 'C:\Users\vagrant\AppData\Local\Temp\wef-Master.zip'
diff --git a/ci/automated_install.sh b/ci/automated_install.sh
index dfd2111..8b20cda 100644
--- a/ci/automated_install.sh
+++ b/ci/automated_install.sh
@@ -24,8 +24,8 @@ ufw --force enable
 # Install Vagrant
 mkdir /opt/vagrant
 cd /opt/vagrant || exit 1
-wget https://releases.hashicorp.com/vagrant/2.0.2/vagrant_2.0.2_x86_64.deb
-dpkg -i vagrant_2.0.2_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.deb
+dpkg -i vagrant_2.0.3_x86_64.deb
 vagrant plugin install vagrant-reload
 
 # Install Packer
diff --git a/ci/automated_install_vagrant_only.sh b/ci/automated_install_vagrant_only.sh
index 463d559..ce4f418 100644
--- a/ci/automated_install_vagrant_only.sh
+++ b/ci/automated_install_vagrant_only.sh
@@ -24,8 +24,8 @@ ufw --force enable
 # Install Vagrant
 mkdir /opt/vagrant
 cd /opt/vagrant || exit 1
-wget https://releases.hashicorp.com/vagrant/2.0.2/vagrant_2.0.2_x86_64.deb
-dpkg -i vagrant_2.0.2_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.deb
+dpkg -i vagrant_2.0.3_x86_64.deb
 vagrant plugin install vagrant-reload
 
 # Make the Vagrant instances headless