EAP6 logging, CL improvements and small fixes