VID-1939 tweaks to captions code