Try and clean up the epatch calls

Not sure what was wrong...