Video fixes

Hopefully this finishes it once and for all.