Video and other fixes