Improve Video support a bit.