shortcode fixes