Thumbnail/image shortcode fixes.