Fixing the shortcodes