EG2 buildfix