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