Flicker bug fixes