Fixups for org-mode.