diff --git a/scripts/wk/cfg/sources.py b/scripts/wk/cfg/sources.py
index ef4f96c8..8ff81bd9 100644
--- a/scripts/wk/cfg/sources.py
+++ b/scripts/wk/cfg/sources.py
@@ -12,7 +12,7 @@ SOURCES = {
   # Main
   'AVRemover32':        'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt32_enu.exe',
   'AVRemover64':        'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt64_enu.exe',
-  'AdwCleaner':         'https://downloads.malwarebytes.com/file/adwcleaner',
+  'AdwCleaner':         'https://adwcleaner.malwarebytes.com/adwcleaner?channel=release',
   'Autologon32':        'http://live.sysinternals.com/Autologon.exe',
   'Autologon64':        'http://live.sysinternals.com/Autologon64.exe',
   'ESET_NOD32_AV32':    'https://download.eset.com/com/eset/apps/home/eav/windows/latest/eav_nt32.exe',
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 9a131594..70308b4b 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -1134,7 +1134,9 @@ def install_mbam():
       break
 
   # Install / Upgrade
-  run_tool('MBAM', 'MBAM', '/VERYSILENT', '/NORESTART', download=True)
+  run_tool(
+    'MBAM', 'MBAM', '/VERYSILENT', '/NORESTART', download=True, popen=True,
+    )
 
 
 def run_adwcleaner():
@@ -1261,6 +1263,10 @@ def run_mbam():
     if test_path.exists():
       exe_path = str(test_path)
 
+  # Bail if MBAM not found
+  if not exe_path:
+    raise FileNotFoundError('MBAM not found')
+
   # Run
   run_program(exe_path, check=False)