Fix some EL functions not honoring key access, backport #2373