Additional caption bug fixes