diff --git a/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py b/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
index d3a4019e..47f4a34 100755
--- a/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
+++ b/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
@@ -84,13 +84,16 @@
             if not 'dynamically linked' in output:
                 logging.error(output)
                 raise error.TestFail('Failed: Flash not dynamically linked.')
-            cpu_arch = utils.get_cpu_arch()
-            if cpu_arch == 'arm' and not 'ARM' in output:
+            arch = utils.get_arch_userspace()
+            logging.info('get_arch_userspace = %s', arch)
+            if arch == 'arm' and not 'ARM' in output:
                 logging.error(output)
                 raise error.TestFail('Failed: Flash binary not for ARM.')
-            if cpu_arch == 'x86_64' and not 'x86-64' in output:
-                raise error.TestFail('Failed: Flash binary not for x86-64.')
-            if cpu_arch == 'i386' and not '80386' in output:
+            if arch == 'x86_64' and not 'x86-64' in output:
+                logging.error(output)
+                raise error.TestFail('Failed: Flash binary not for x86_64.')
+            if arch == 'i386' and not '80386' in output:
+                logging.error(output)
                 raise error.TestFail('Failed: Flash binary not for i386.')
         logging.info('Verified file %s', name)
 
diff --git a/server/site_tests/component_UpdateFlash/component_UpdateFlash.py b/server/site_tests/component_UpdateFlash/component_UpdateFlash.py
index 762a28a..a845c63 100644
--- a/server/site_tests/component_UpdateFlash/component_UpdateFlash.py
+++ b/server/site_tests/component_UpdateFlash/component_UpdateFlash.py
@@ -57,6 +57,7 @@
 
     def cleanup(self):
         """Leaves this test without a component Flash installed."""
+        logging.info('+++++ Cleaning DUT for other tests +++++')
         self._delete_component()
 
     def run_once(self, host):
@@ -65,6 +66,7 @@
         self.autotest_client = autotest.Autotest(self.host)
         # Paranoia: by rebooting the DUT we protect this test from other tests
         # leaving running webservers behind.
+        logging.info('+++++ Rebooting DUT on start to reduce flakes +++++')
         self._reboot()
         # Test Flash once with whatever was the default on the DUT.
         self._run_flash_sanity()