two changes to make building EPIA work