Two more small fixes for new Shortcode Parser