Fixing some bugs that prevented the video to be transferred