EiF changes from standard SWGEMU