A couple of fixes: org-element and org-affiliated-keyword