More flicker fixes for bubbles.