Some fixes for caption