Fix some shortcodes bugs