Fix bugs in EKE