More blinking fixes