Fix flickering controls