Minor tweaks to prevent video based glitches