flake fixes

Change-Id: I382f67fb89e271ea1f523ea63bd78cbd012ecce6