Small fixes to Video Server