Video container fixes for issue #3405