Updated to make sure we can build EAP5