More flicker fixes.