More fixes to video stuff

Change-Id: I38325705a8551d8ba140b3d3896fd3eab7d69482