Fixed issues with video