Fixing Shortcode Issues