Fixes to caption