Patching org-mode issues