Fix recent flicker issues