Fix AMO stats following ES 1.0 preparation