more epv fixes