Some ES mapping changes.