Video work and a few Shared Partnership bug fixes