Couple of cleanup things on the video stuff