Tweaks for new org-mode