More updates to EAPI=5