Fix EAPI=0 errors