Tweaks for captions and auto numbering