Resolve some flickering problems