Slight improvements to caption robustness.