Shortcodes fixup