Fixed video bugs in develop branch