Couple of fixes for the orgmode plugin

A couple of fixes for issues with the org-mode plugin, reported by 邓栓.