Fix shortcode bugs