numerous changes to support running on EAP6