Minor CaptionForm improvements