More shortcode fixes