Close GH-609: Captions fixes. Fixes #564, Fixes #542