Fix more aei issues related to the zlul report