Eapi5 isue fixes