--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -267,16 +267,18 @@ class DesktopSingleLocale(LocalesMixin, 
             for t in unknown_tokens:
                 msg.append(t)
             self.fatal(' '.join(msg))
         self.info('configuration looks ok')
 
         self.read_buildbot_config()
         if not self.buildbot_config:
             self.warning("Skipping buildbot properties overrides")
+            # Set an empty dict
+            self.buildbot_config = {"properties": {}}
             return
         props = self.buildbot_config["properties"]
         for prop in ['mar_tools_url']:
             if props.get(prop):
                 self.info("Overriding %s with %s" % (prop, props[prop]))
                 self.config[prop] = props.get(prop)
 
     def _get_configuration_tokens(self, iterable):
@@ -804,20 +806,25 @@ class DesktopSingleLocale(LocalesMixin, 
         if self.config.get("simple_name_move"):
             # Assume an UPLOAD PATH
             upload_target = self.config["upload_env"]["UPLOAD_PATH"]
             target_path = os.path.join(upload_target, locale)
             self.mkdir_p(target_path)
             glob_name = "*.%s.*" % locale
             matches = (glob.glob(os.path.join(upload_target, glob_name)) +
                        glob.glob(os.path.join(upload_target, 'update', glob_name)) +
-                       glob.glob(os.path.join(upload_target, '*', 'xpi', glob_name)))
+                       glob.glob(os.path.join(upload_target, '*', 'xpi', glob_name)) +
+                       glob.glob(os.path.join(upload_target, 'install', 'sea', glob_name)) +
+                       glob.glob(os.path.join(upload_target, 'setup.exe')) +
+                       glob.glob(os.path.join(upload_target, 'setup-stub.exe')))
             targets_exts = ["tar.bz2", "dmg", "langpack.xpi",
-                            "complete.mar", "checksums"]
+                            "complete.mar", "checksums", "zip",
+                            "installer.exe", "installer-stub.exe"]
             targets = ["target.%s" % ext for ext in targets_exts]
+            targets.extend(['setup.exe', 'setup-stub.exe'])
             for f in matches:
                 target_file = next(target_file for target_file in targets
                                     if f.endswith(target_file[6:]))
                 if target_file:
                     # Remove from list of available options for this locale
                     targets.remove(target_file)
                 else:
                     # wasn't valid (or already matched)