More CaptionAider changes fixes.