More bug fixes to figcaption