Some flickering fixes