Fixed video, state changes issues