Tweaks related to smoketest-in-eyes false alarms.
Fix related to smoketest fix unfix fixed.