Proper ED and CUP/HVP handlers