Fix legacy problems with dumb access to raw ES data